Skip to content

Commit f79cca5

Browse files
bmomjianbmomjian
committed
revert: add transaction processing chapter with internals info
This doc patch (master hash 66bc9d2) was decided to be too significant for backpatching, so reverted in all but master. Also fix SGML file header comment in master. Reported-by: Peter Eisentraut Discussion: https://postgr.es/m/c6304b19-6ff7-f3af-0148-cf7aa7e2fbfd@enterprisedb.com Backpatch-through: 11
1 parent f2f9e11 commit f79cca5

14 files changed

+44
-292
lines changed

‎doc/src/sgml/config.sgml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7218,14 +7218,12 @@ local0.* /var/log/postgresql
72187218
</row>
72197219
<row>
72207220
<entry><literal>%v</literal></entry>
7221-
<entry>Virtual transaction ID (backendID/localXID); see
7222-
<xref linkend="transaction-id"/></entry>
7221+
<entry>Virtual transaction ID (backendID/localXID)</entry>
72237222
<entry>no</entry>
72247223
</row>
72257224
<row>
72267225
<entry><literal>%x</literal></entry>
7227-
<entry>Transaction ID (0 if none is assigned); see
7228-
<xref linkend="transaction-id"/></entry>
7226+
<entry>Transaction ID (0 if none is assigned)</entry>
72297227
<entry>no</entry>
72307228
</row>
72317229
<row>

‎doc/src/sgml/datatype.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4979,8 +4979,7 @@ WHERE ...
49794979
<structfield>xmin</structfield> and <structfield>xmax</structfield>. Transaction identifiers are 32-bit quantities.
49804980
In some contexts, a 64-bit variant <type>xid8</type> is used. Unlike
49814981
<type>xid</type> values, <type>xid8</type> values increase strictly
4982-
monotonically and cannot be reused in the lifetime of a database
4983-
cluster. See <xref linkend="transaction-id"/> for more details.
4982+
monotonically and cannot be reused in the lifetime of a database cluster.
49844983
</para>
49854984

49864985
<para>

‎doc/src/sgml/filelist.sgml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@
104104
<!ENTITY protocol SYSTEM "protocol.sgml">
105105
<!ENTITY sources SYSTEM "sources.sgml">
106106
<!ENTITY storage SYSTEM "storage.sgml">
107-
<!ENTITY transaction SYSTEM "xact.sgml">
108107
<!ENTITY tablesample-method SYSTEM "tablesample-method.sgml">
109108
<!ENTITY generic-wal SYSTEM "generic-wal.sgml">
110109
<!ENTITY custom-rmgr SYSTEM "custom-rmgr.sgml">

‎doc/src/sgml/func.sgml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24624,10 +24624,7 @@ SELECT collation for ('foo' COLLATE "de_DE");
2462424624
<para>
2462524625
Returns the current transaction's ID. It will assign a new one if the
2462624626
current transaction does not have one already (because it has not
24627-
performed any database updates); see <xref
24628-
linkend="transaction-id"/> for details. If executed in a
24629-
subtransaction, this will return the top-level transaction ID;
24630-
see <xref linkend="subxacts"/> for details.
24627+
performed any database updates).
2463124628
</para></entry>
2463224629
</row>
2463324630

@@ -24644,8 +24641,6 @@ SELECT collation for ('foo' COLLATE "de_DE");
2464424641
ID is assigned yet. (It's best to use this variant if the transaction
2464524642
might otherwise be read-only, to avoid unnecessary consumption of an
2464624643
XID.)
24647-
If executed in a subtransaction, this will return the top-level
24648-
transaction ID.
2464924644
</para></entry>
2465024645
</row>
2465124646

@@ -24689,9 +24684,6 @@ SELECT collation for ('foo' COLLATE "de_DE");
2468924684
<para>
2469024685
Returns a current <firstterm>snapshot</firstterm>, a data structure
2469124686
showing which transaction IDs are now in-progress.
24692-
Only top-level transaction IDs are included in the snapshot;
24693-
subtransaction IDs are not shown; see <xref linkend="subxacts"/>
24694-
for details.
2469524687
</para></entry>
2469624688
</row>
2469724689

@@ -24746,8 +24738,7 @@ SELECT collation for ('foo' COLLATE "de_DE");
2474624738
Is the given transaction ID <firstterm>visible</firstterm> according
2474724739
to this snapshot (that is, was it completed before the snapshot was
2474824740
taken)? Note that this function will not give the correct answer for
24749-
a subtransaction ID (subxid); see <xref linkend="subxacts"/> for
24750-
details.
24741+
a subtransaction ID.
2475124742
</para></entry>
2475224743
</row>
2475324744
</tbody>
@@ -24759,9 +24750,8 @@ SELECT collation for ('foo' COLLATE "de_DE");
2475924750
wraps around every 4 billion transactions. However,
2476024751
the functions shown in <xref linkend="functions-pg-snapshot"/> use a
2476124752
64-bit type <type>xid8</type> that does not wrap around during the life
24762-
of an installation and can be converted to <type>xid</type> by casting if
24763-
required; see <xref linkend="transaction-id"/> for details.
24764-
The data type <type>pg_snapshot</type> stores information about
24753+
of an installation, and can be converted to <type>xid</type> by casting if
24754+
required. The data type <type>pg_snapshot</type> stores information about
2476524755
transaction ID visibility at a particular moment in time. Its components
2476624756
are described in <xref linkend="functions-pg-snapshot-parts"/>.
2476724757
<type>pg_snapshot</type>'s textual representation is
@@ -24807,7 +24797,7 @@ SELECT collation for ('foo' COLLATE "de_DE");
2480724797
xmax</literal> and not in this list was already completed at the time
2480824798
of the snapshot, and thus is either visible or dead according to its
2480924799
commit status. This list does not include the transaction IDs of
24810-
subtransactions (subxids).
24800+
subtransactions.
2481124801
</entry>
2481224802
</row>
2481324803
</tbody>

‎doc/src/sgml/glossary.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1710,8 +1710,7 @@
17101710
<literal>3</literal> (values under that are reserved) and the
17111711
epoch value is incremented by one.
17121712
In some contexts, the epoch and xid values are
1713-
considered together as a single 64-bit value; see <xref
1714-
linkend="transaction-id"/> for more details.
1713+
considered together as a single 64-bit value.
17151714
</para>
17161715
<para>
17171716
For more information, see

‎doc/src/sgml/monitoring.sgml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -918,8 +918,7 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser
918918
<structfield>backend_xid</structfield> <type>xid</type>
919919
</para>
920920
<para>
921-
Top-level transaction identifier of this backend, if any; see
922-
<xref linkend="transaction-id"/>.
921+
Top-level transaction identifier of this backend, if any.
923922
</para></entry>
924923
</row>
925924

@@ -1886,8 +1885,7 @@ postgres 27093 0.0 0.0 30096 2752 ? Ss 11:34 0:00 postgres: ser
18861885
</row>
18871886
<row>
18881887
<entry><literal>virtualxid</literal></entry>
1889-
<entry>Waiting to acquire a virtual transaction ID lock; see
1890-
<xref linkend="transaction-id"/>.</entry>
1888+
<entry>Waiting to acquire a virtual transaction ID lock.</entry>
18911889
</row>
18921890
</tbody>
18931891
</tgroup>

‎doc/src/sgml/pgrowlocks.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ pgrowlocks(text) returns setof record
5757
<row>
5858
<entry><structfield>locker</structfield></entry>
5959
<entry><type>xid</type></entry>
60-
<entry>Transaction ID of locker, or multixact ID if
61-
multitransaction; see <xref linkend="transaction-id"/></entry>
60+
<entry>Transaction ID of locker, or multixact ID if multitransaction</entry>
6261
</row>
6362
<row>
6463
<entry><structfield>multi</structfield></entry>

‎doc/src/sgml/postgres.sgml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@ break is not needed in a wider output rendering.
271271
&brin;
272272
&hash;
273273
&storage;
274-
&transaction;
275274
&bki;
276275
&planstats;
277276
&backup-manifest;

‎doc/src/sgml/ref/release_savepoint.sgml

Lines changed: 21 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PostgreSQL documentation
2121

2222
<refnamediv>
2323
<refname>RELEASE SAVEPOINT</refname>
24-
<refpurpose>release a previously defined savepoint</refpurpose>
24+
<refpurpose>destroy a previously defined savepoint</refpurpose>
2525
</refnamediv>
2626

2727
<refsynopsisdiv>
@@ -34,13 +34,23 @@ RELEASE [ SAVEPOINT ] <replaceable>savepoint_name</replaceable>
3434
<title>Description</title>
3535

3636
<para>
37-
<command>RELEASE SAVEPOINT</command> releases the named savepoint and
38-
all active savepoints that were created after the named savepoint,
39-
and frees their resources. All changes made since the creation of
40-
the savepoint that didn't already get rolled back are merged into
41-
the transaction or savepoint that was active when the named savepoint
42-
was created. Changes made after <command>RELEASE SAVEPOINT</command>
43-
will also be part of this active transaction or savepoint.
37+
<command>RELEASE SAVEPOINT</command> destroys a savepoint previously defined
38+
in the current transaction.
39+
</para>
40+
41+
<para>
42+
Destroying a savepoint makes it unavailable as a rollback point,
43+
but it has no other user visible behavior. It does not undo the
44+
effects of commands executed after the savepoint was established.
45+
(To do that, see <xref linkend="sql-rollback-to"/>.)
46+
Destroying a savepoint when
47+
it is no longer needed allows the system to reclaim some resources
48+
earlier than transaction end.
49+
</para>
50+
51+
<para>
52+
<command>RELEASE SAVEPOINT</command> also destroys all savepoints that were
53+
established after the named savepoint was established.
4454
</para>
4555
</refsect1>
4656

@@ -52,7 +62,7 @@ RELEASE [ SAVEPOINT ] <replaceable>savepoint_name</replaceable>
5262
<term><replaceable>savepoint_name</replaceable></term>
5363
<listitem>
5464
<para>
55-
The name of the savepoint to release.
65+
The name of the savepoint to destroy.
5666
</para>
5767
</listitem>
5868
</varlistentry>
@@ -68,7 +78,7 @@ RELEASE [ SAVEPOINT ] <replaceable>savepoint_name</replaceable>
6878

6979
<para>
7080
It is not possible to release a savepoint when the transaction is in
71-
an aborted state; to do that, use <xref linkend="sql-rollback-to"/>.
81+
an aborted state.
7282
</para>
7383

7484
<para>
@@ -83,7 +93,7 @@ RELEASE [ SAVEPOINT ] <replaceable>savepoint_name</replaceable>
8393
<title>Examples</title>
8494

8595
<para>
86-
To establish and later release a savepoint:
96+
To establish and later destroy a savepoint:
8797
<programlisting>
8898
BEGIN;
8999
INSERT INTO table1 VALUES (3);
@@ -94,36 +104,6 @@ COMMIT;
94104
</programlisting>
95105
The above transaction will insert both 3 and 4.
96106
</para>
97-
98-
<para>
99-
A more complex example with multiple nested subtransactions:
100-
<programlisting>
101-
BEGIN;
102-
INSERT INTO table1 VALUES (1);
103-
SAVEPOINT sp1;
104-
INSERT INTO table1 VALUES (2);
105-
SAVEPOINT sp2;
106-
INSERT INTO table1 VALUES (3);
107-
RELEASE SAVEPOINT sp2;
108-
INSERT INTO table1 VALUES (4))); -- generates an error
109-
</programlisting>
110-
In this example, the application requests the release of the savepoint
111-
<literal>sp2</literal>, which inserted 3. This changes the insert's
112-
transaction context to <literal>sp1</literal>. When the statement
113-
attempting to insert value 4 generates an error, the insertion of 2 and
114-
4 are lost because they are in the same, now-rolled back savepoint,
115-
and value 3 is in the same transaction context. The application can
116-
now only choose one of these two commands, since all other commands
117-
will be ignored:
118-
<programlisting>
119-
ROLLBACK;
120-
ROLLBACK TO SAVEPOINT sp1;
121-
</programlisting>
122-
Choosing <command>ROLLBACK</command> will abort everything, including
123-
value 1, whereas <command>ROLLBACK TO SAVEPOINT sp1</command> will retain
124-
value 1 and allow the transaction to continue.
125-
</para>
126-
127107
</refsect1>
128108

129109
<refsect1>

‎doc/src/sgml/ref/rollback.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ ROLLBACK [ WORK | TRANSACTION ] [ AND [ NO ] CHAIN ]
5656
<term><literal>AND CHAIN</literal></term>
5757
<listitem>
5858
<para>
59-
If <literal>AND CHAIN</literal> is specified, a new (not aborted)
60-
transaction is immediately started with the same transaction
61-
characteristics (see <xref linkend="sql-set-transaction"/>) as the
62-
just finished one. Otherwise, no new transaction is started.
59+
If <literal>AND CHAIN</literal> is specified, a new transaction is
60+
immediately started with the same transaction characteristics (see <xref
61+
linkend="sql-set-transaction"/>) as the just finished one. Otherwise,
62+
no new transaction is started.
6363
</para>
6464
</listitem>
6565
</varlistentry>

‎doc/src/sgml/ref/rollback_to.sgml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] <replaceable>savepoint_name</re
3535

3636
<para>
3737
Roll back all commands that were executed after the savepoint was
38-
established and then start a new subtransaction at the same transaction level.
39-
The savepoint remains valid and can be rolled back to again later,
40-
if needed.
38+
established. The savepoint remains valid and can be rolled back to
39+
again later, if needed.
4140
</para>
4241

4342
<para>

‎doc/src/sgml/system-views.sgml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,8 +1395,7 @@
13951395
</para>
13961396
<para>
13971397
Virtual ID of the transaction targeted by the lock,
1398-
or null if the target is not a virtual transaction ID; see
1399-
<xref linkend="transactions"/>
1398+
or null if the target is not a virtual transaction ID
14001399
</para></entry>
14011400
</row>
14021401

@@ -1405,8 +1404,8 @@
14051404
<structfield>transactionid</structfield> <type>xid</type>
14061405
</para>
14071406
<para>
1408-
ID of the transaction targeted by the lock, or null if the target
1409-
is not a transaction ID; <xref linkend="transactions"/>
1407+
ID of the transaction targeted by the lock,
1408+
or null if the target is not a transaction ID
14101409
</para></entry>
14111410
</row>
14121411

‎doc/src/sgml/wal.sgml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
<title>Reliability and the Write-Ahead Log</title>
55

66
<para>
7-
This chapter explains how to control the reliability of
8-
<productname>PostgreSQL</productname>, including details about the
9-
Write-Ahead Log.
7+
This chapter explains how the Write-Ahead Log is used to obtain
8+
efficient, reliable operation.
109
</para>
1110

1211
<sect1 id="wal-reliability">
@@ -909,5 +908,4 @@
909908
seem to be a problem in practice.
910909
</para>
911910
</sect1>
912-
913911
</chapter>

0 commit comments

Comments
 (0)