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

Commit2b22795

Browse files
committed
Copy editing of the replication origins patch.
Michael Paquier and myself.
1 parent1db12da commit2b22795

File tree

4 files changed

+22
-23
lines changed

4 files changed

+22
-23
lines changed

‎doc/src/sgml/func.sgml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17086,9 +17086,8 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
1708617086
<parameter>internal_id</parameter> <type>oid</type>
1708717087
</entry>
1708817088
<entry>
17089-
Lookup replication origin by name and return the internal
17090-
oid. If no corresponding replication origin is found a error
17091-
is thrown.
17089+
Lookup replication origin by name and return the internal id. If no
17090+
corresponding replication origin is found an error is thrown.
1709217091
</entry>
1709317092
</row>
1709417093

‎doc/src/sgml/replication-origins.sgml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
</para>
2323

2424
<para>
25-
Replication origins consist out of a name andaoid. The name, which
26-
is what should be used to refer to the origin across systems, is
27-
free-form text. It should be used in a way that makes conflicts
28-
between replication origins created by different replication
29-
solutionsunlikely; e.g. by prefixing the replication solution's
30-
name to it.The oid is used only to avoid having to store the long
31-
versionin situations where space efficiency is important. It should
32-
never be sharedbetween systems.
25+
Replication origins consist out of a name andan <type>oid</type>. The name,
26+
whichis what should be used to refer to the origin across systems, is
27+
free-form<type>text</type>. It should be used in a way that makes conflicts
28+
between replication origins created by different replication solutions
29+
unlikely; e.g. by prefixing the replication solution's name to it.
30+
The<type>oid</type> is used only to avoid having to store the long version
31+
in situations where space efficiency is important. It should never be shared
32+
between systems.
3333
</para>
3434

3535
<para>
@@ -61,11 +61,11 @@
6161
timestamp of every source transaction can be configured on a per
6262
transaction basis using
6363
<link linkend="pg-replication-origin-xact-setup"><function>pg_replication_origin_xact_setup()</function></link>.
64-
If that's done replication progress willbepersist in a crash safe
64+
If that's done replication progress will persist in a crash safe
6565
manner. Replay progress for all replication origins can be seen in the
6666
<link linkend="catalog-pg-replication-origin-status">
6767
<structname>pg_replication_origin_status</structname>
68-
</link> view.A individual origin's progress, e.g. when resuming
68+
</link> view.An individual origin's progress, e.g. when resuming
6969
replication, can be acquired using
7070
<link linkend="pg-replication-origin-progress"><function>pg_replication_origin_progress()</function></link>
7171
for any origin or
@@ -75,9 +75,9 @@
7575

7676
<para>
7777
In more complex replication topologies than replication from exactly one
78-
system to one other, another problem can be that, that it is hard to avoid
78+
system to one other, another problem can be that it is hard to avoid
7979
replicating replayed rows again. That can lead both to cycles in the
80-
replication and inefficiencies. Replication origins providea optional
80+
replication and inefficiencies. Replication origins providean optional
8181
mechanism to recognize and prevent that. When configured using the functions
8282
referenced in the previous paragraph, every change and transaction passed to
8383
output plugin callbacks (see <xref linkend="logicaldecoding-output-plugin">)

‎src/backend/replication/logical/origin.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* This file provides the following:
1414
* * An infrastructure to name nodes in a replication setup
15-
* * A facility to efficiently store and persist replication progress ina
15+
* * A facility to efficiently store and persist replication progress inan
1616
* efficient and durable manner.
1717
*
1818
* Replication origin consist out of a descriptive, user defined, external
@@ -44,14 +44,14 @@
4444
*
4545
* There are several levels of locking at work:
4646
*
47-
* * To create and drop replication originsa exclusive lock on
47+
* * To create and drop replication originsan exclusive lock on
4848
* pg_replication_slot is required for the duration. That allows us to
4949
* safely and conflict free assign new origins using a dirty snapshot.
5050
*
51-
* * When creatinga in-memory replication progress slot the ReplicationOirgin
51+
* * When creatingan in-memory replication progress slot the ReplicationOirgin
5252
* LWLock has to be held exclusively; when iterating over the replication
5353
* progress a shared lock has to be held, the same when advancing the
54-
* replication progress ofa individual backend that has not setup as the
54+
* replication progress ofan individual backend that has not setup as the
5555
* session's replication origin.
5656
*
5757
* * When manipulating or looking at the remote_lsn and local_lsn fields of a
@@ -251,7 +251,7 @@ replorigin_create(char *roname)
251251
* We need the numeric replication origin to be 16bit wide, so we cannot
252252
* rely on the normal oid allocation. Instead we simply scan
253253
* pg_replication_origin for the first unused id. That's not particularly
254-
* efficient, but this should bean fairly infrequent operation - we can
254+
* efficient, but this should bea fairly infrequent operation - we can
255255
* easily spend a bit more code on this when it turns out it needs to be
256256
* faster.
257257
*
@@ -1078,7 +1078,7 @@ replorigin_session_setup(RepOriginId node)
10781078
/*
10791079
* Reset replay state previously setup in this session.
10801080
*
1081-
* This function may only be called ifa origin was setup with
1081+
* This function may only be called ifan origin was setup with
10821082
* replorigin_session_setup().
10831083
*/
10841084
void
@@ -1121,7 +1121,7 @@ replorigin_session_advance(XLogRecPtr remote_commit, XLogRecPtr local_commit)
11211121

11221122
/*
11231123
* Ask the machinery about the point up to which we successfully replayed
1124-
* changes froma already setup replication origin.
1124+
* changes froman already setup replication origin.
11251125
*/
11261126
XLogRecPtr
11271127
replorigin_session_get_progress(boolflush)

‎src/include/catalog/pg_replication_origin.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CATALOG(pg_replication_origin,6000) BKI_SHARED_RELATION BKI_WITHOUT_OIDS
3434
*
3535
* This should never leave the system.
3636
*
37-
* Needs to fit intoa uint16, so we don't waste too much space in WAL
37+
* Needs to fit intoan uint16, so we don't waste too much space in WAL
3838
* records. For this reason we don't use a normal Oid column here, since
3939
* we need to handle allocation of new values manually.
4040
*/

0 commit comments

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