Skip to content

Commit 1aac32d

Browse files
committed
Revert 0f5ca02
0f5ca02 introduces 3 new keywords. It appears to be too much for relatively small feature. Given now we past feature freeze, it's already late for discussion of the new syntax. So, revert. Discussion: https://postgr.es/m/28209.1586294824%40sss.pgh.pa.us
1 parent 02a2e8b commit 1aac32d

File tree

20 files changed

+10
-585
lines changed

20 files changed

+10
-585
lines changed

Diff for: doc/src/sgml/ref/begin.sgml

+1-16
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PostgreSQL documentation
2121

2222
<refsynopsisdiv>
2323
<synopsis>
24-
BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ] [ WAIT FOR LSN <replaceable class="parameter">lsn_value</replaceable> [TIMEOUT <replaceable class="parameter">number_of_milliseconds</replaceable> ] ]
24+
BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ]
2525

2626
<phrase>where <replaceable class="parameter">transaction_mode</replaceable> is one of:</phrase>
2727

@@ -63,17 +63,6 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
6363
<xref linkend="sql-set-transaction"/>
6464
was executed.
6565
</para>
66-
67-
<para>
68-
The <literal>WAIT FOR</literal> clause allows to wait for the target log
69-
sequence number (<acronym>LSN</acronym>) to be replayed on standby before
70-
starting the transaction in <productname>PostgreSQL</productname> databases
71-
with master-standby asynchronous replication. Wait time can be limited by
72-
specifying a timeout, which is measured in milliseconds and must be a positive
73-
integer. If <acronym>LSN</acronym> was not reached before timeout, transaction
74-
doesn't begin. Waiting can be interrupted by cancelling
75-
<literal>BEGIN</literal> command.
76-
</para>
7766
</refsect1>
7867

7968
<refsect1>
@@ -157,10 +146,6 @@ BEGIN;
157146
different purpose in embedded SQL. You are advised to be careful
158147
about the transaction semantics when porting database applications.
159148
</para>
160-
161-
<para>
162-
There is no <literal>WAIT FOR</literal> clause in the SQL standard.
163-
</para>
164149
</refsect1>
165150

166151
<refsect1>

Diff for: doc/src/sgml/ref/start_transaction.sgml

+1-16
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PostgreSQL documentation
2121

2222
<refsynopsisdiv>
2323
<synopsis>
24-
START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ] [ WAIT FOR LSN <replaceable class="parameter">lsn_value</replaceable> [TIMEOUT <replaceable class="parameter">number_of_milliseconds</replaceable> ] ]
24+
START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ]
2525

2626
<phrase>where <replaceable class="parameter">transaction_mode</replaceable> is one of:</phrase>
2727

@@ -40,17 +40,6 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
4040
characteristics, as if <xref linkend="sql-set-transaction"/> was executed. This is the same
4141
as the <xref linkend="sql-begin"/> command.
4242
</para>
43-
44-
<para>
45-
The <literal>WAIT FOR</literal> clause allows to wait for the target log
46-
sequence number (<acronym>LSN</acronym>) to be replayed on standby before
47-
starting the transaction in <productname>PostgreSQL</productname> databases
48-
with master-standby asynchronous replication. Wait time can be limited by
49-
specifying a timeout, which is measured in milliseconds and must be a positive
50-
integer. If <acronym>LSN</acronym> was not reached before timeout, transaction
51-
doesn't begin. Waiting can be interrupted by cancelling
52-
<literal>START TRANSACTION</literal> command.
53-
</para>
5443
</refsect1>
5544

5645
<refsect1>
@@ -89,10 +78,6 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
8978
omitted.
9079
</para>
9180

92-
<para>
93-
There is no <literal>WAIT FOR</literal> clause in the SQL standard.
94-
</para>
95-
9681
<para>
9782
See also the compatibility section of <xref linkend="sql-set-transaction"/>.
9883
</para>

Diff for: src/backend/access/transam/xlog.c

-13
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#include "catalog/pg_database.h"
4343
#include "commands/progress.h"
4444
#include "commands/tablespace.h"
45-
#include "commands/wait.h"
4645
#include "common/controldata_utils.h"
4746
#include "executor/instrument.h"
4847
#include "miscadmin.h"
@@ -7157,7 +7156,6 @@ StartupXLOG(void)
71577156
do
71587157
{
71597158
bool switchedTLI = false;
7160-
XLogRecPtr minWaitedLSN;
71617159

71627160
#ifdef WAL_DEBUG
71637161
if (XLOG_DEBUG ||
@@ -7361,17 +7359,6 @@ StartupXLOG(void)
73617359
break;
73627360
}
73637361

7364-
/*
7365-
* If we replayed an LSN that someone was waiting for, set
7366-
* latches in shared memory array to notify the waiter.
7367-
*/
7368-
minWaitedLSN = WaitLSNGetMin();
7369-
if (!XLogRecPtrIsInvalid(minWaitedLSN) &&
7370-
minWaitedLSN <= XLogCtl->lastReplayedEndRecPtr)
7371-
{
7372-
WaitLSNSetLatch(XLogCtl->lastReplayedEndRecPtr);
7373-
}
7374-
73757362
/* Else, try to fetch the next WAL record */
73767363
record = ReadRecord(xlogreader, LOG, false);
73777364
} while (record != NULL);

Diff for: src/backend/commands/Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ OBJS = \
5757
user.o \
5858
vacuum.o \
5959
variable.o \
60-
view.o \
61-
wait.o
60+
view.o
6261

6362
include $(top_srcdir)/src/backend/common.mk

0 commit comments

Comments
 (0)