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

Commite613466

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 parent21640e9 commite613466

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
@@ -982,7 +982,7 @@ SET LOCAL search_path TO @extschema@, pg_temp;
982982
<application>pg_dump</application>. But that behavior is undesirable for a
983983
configuration table; any data changes made by the user need to be
984984
included in dumps, or the extension will behave differently after a dump
985-
andreload.
985+
andrestore.
986986
</para>
987987

988988
<indexterm>

‎doc/src/sgml/perform.sgml

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

17861786
<para>
17871787
Dump scripts generated by <application>pg_dump</application> automatically apply
1788-
several, but not all, of the above guidelines. Toreload a
1788+
several, but not all, of the above guidelines. Torestore a
17891789
<application>pg_dump</application> dump as quickly as possible, you need to
17901790
do a few extra things manually. (Note that these points apply while
17911791
<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
@@ -156,7 +156,7 @@
156156
attached to a function when <varname>check_function_bodies</varname> is on.
157157
Therefore, checks whose results might be affected by GUC parameters
158158
definitely should be skipped when <varname>check_function_bodies</varname> is
159-
off, to avoid false failures whenreloading a dump.
159+
off, to avoid false failures whenrestoring a dump.
160160
</para>
161161

162162
<para>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ ALTER TYPE <replaceable class="parameter">name</replaceable> SET ( <replaceable
411411
around</quote> since the original creation of the enum type). The slowdown is
412412
usually insignificant; but if it matters, optimal performance can be
413413
regained by dropping and recreating the enum type, or by dumping and
414-
reloading the database.
414+
restoring the database.
415415
</para>
416416
</refsect1>
417417

‎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
@@ -694,7 +694,7 @@ PostgreSQL documentation
694694
...</literal>). This will make restoration very slow; it is mainly
695695
useful for making dumps that can be loaded into
696696
non-<productname>PostgreSQL</productname> databases.
697-
Any error duringreloading will cause only rows that are part of the
697+
Any error duringrestoring will cause only rows that are part of the
698698
problematic <command>INSERT</command> to be lost, rather than the
699699
entire table contents.
700700
</para>
@@ -718,9 +718,9 @@ PostgreSQL documentation
718718
This option is relevant only when creating a data-only dump.
719719
It instructs <application>pg_dump</application> to include commands
720720
to temporarily disable triggers on the target tables while
721-
the data isreloaded. Use this if you have referential
721+
the data isrestored. Use this if you have referential
722722
integrity checks or other triggers on the tables that you
723-
do not want to invoke during datareload.
723+
do not want to invoke during datarestore.
724724
</para>
725725

726726
<para>
@@ -838,7 +838,7 @@ PostgreSQL documentation
838838
than <command>COPY</command>). This will make restoration very slow;
839839
it is mainly useful for making dumps that can be loaded into
840840
non-<productname>PostgreSQL</productname> databases.
841-
Any error duringreloading will cause only rows that are part of the
841+
Any error duringrestoring will cause only rows that are part of the
842842
problematic <command>INSERT</command> to be lost, rather than the
843843
entire table contents. Note that the restore might fail altogether if
844844
you have rearranged column order. The
@@ -857,7 +857,7 @@ PostgreSQL documentation
857857
target the root of the partitioning hierarchy that contains it, rather
858858
than the partition itself. This causes the appropriate partition to
859859
be re-determined for each row when the data is loaded. This may be
860-
useful whenreloading data on a server where rows do not always fall
860+
useful whenrestoring data on a server where rows do not always fall
861861
into the same partitions as they did on the original server. That
862862
could happen, for example, if the partitioning column is of type text
863863
and the two systems have different definitions of the collation used
@@ -869,7 +869,7 @@ PostgreSQL documentation
869869
with this option, because <application>pg_restore</application> will
870870
not know exactly which partition(s) a given archive data item will
871871
load data into. This could result in inefficiency due to lock
872-
conflicts between parallel jobs, or perhaps evenreload failures due
872+
conflicts between parallel jobs, or perhaps evenrestore failures due
873873
to foreign key constraints being set up before all the relevant data
874874
is loaded.
875875
</para>
@@ -1031,7 +1031,7 @@ PostgreSQL documentation
10311031
Dump data as <command>INSERT</command> commands (rather than
10321032
<command>COPY</command>). Controls the maximum number of rows per
10331033
<command>INSERT</command> command. The value specified must be a
1034-
number greater than zero. Any error duringreloading will cause only
1034+
number greater than zero. Any error duringrestoring will cause only
10351035
rows that are part of the problematic <command>INSERT</command> to be
10361036
lost, rather than the entire table contents.
10371037
</para>

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

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

283283
<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
@@ -518,7 +518,7 @@ PostgreSQL documentation
518518
Dump data as <command>INSERT</command> commands (rather than
519519
<command>COPY</command>). Controls the maximum number of rows per
520520
<command>INSERT</command> command. The value specified must be a
521-
number greater than zero. Any error duringreloading will cause only
521+
number greater than zero. Any error duringrestoring will cause only
522522
rows that are part of the problematic <command>INSERT</command> to be
523523
lost, rather than the entire table contents.
524524
</para>
@@ -787,7 +787,7 @@ PostgreSQL documentation
787787
</para>
788788

789789
<para>
790-
Toreload database(s) from this file, you can use:
790+
Torestore database(s) from this file, you can use:
791791
<screen>
792792
<prompt>$</prompt> <userinput>psql -f db.out postgres</userinput>
793793
</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
@@ -538,9 +538,9 @@ PostgreSQL documentation
538538
This option is relevant only when performing a data-only restore.
539539
It instructs <application>pg_restore</application> to execute commands
540540
to temporarily disable triggers on the target tables while
541-
the data isreloaded. Use this if you have referential
541+
the data isrestored. Use this if you have referential
542542
integrity checks or other triggers on the tables that you
543-
do not want to invoke during datareload.
543+
do not want to invoke during datarestore.
544544
</para>
545545

546546
<para>
@@ -958,7 +958,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
958958
</para>
959959

960960
<para>
961-
Toreload the dump into a new database called <literal>newdb</literal>:
961+
Torestore the dump into a new database called <literal>newdb</literal>:
962962

963963
<screen>
964964
<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 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
@@ -1678,7 +1678,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
16781678
For <emphasis>major</emphasis> releases of <productname>PostgreSQL</productname>, the
16791679
internal data storage format is subject to change, thus complicating
16801680
upgrades. The traditional method for moving data to a new major version
1681-
is to dump andreload the database, though this can be slow. A
1681+
is to dump andrestore the database, though this can be slow. A
16821682
faster method is <xref linkend="pgupgrade"/>. Replication methods are
16831683
also available, as discussed below.
16841684
(If you are using a pre-packaged version
@@ -1764,7 +1764,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
17641764

17651765
<para>
17661766
One upgrade method is to dump data from one major version of
1767-
<productname>PostgreSQL</productname> andreload it in another &mdash; to do
1767+
<productname>PostgreSQL</productname> andrestore it in another &mdash; to do
17681768
this, you must use a <emphasis>logical</emphasis> backup tool like
17691769
<application>pg_dumpall</application>; file system
17701770
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 andreload.
1977+
lead to problems such as search results changing after a dump andrestore.
19781978
</para>
19791979

19801980
</sect2>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp