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
Appearance settings

Commit 82ff0cc

Browse filesBrowse files
tglsfdctglsfdc
committed
Advance transaction timestamp for intra-procedure transactions.
Per discussion, this behavior seems less astonishing than not doing so. Peter Eisentraut and Tom Lane Discussion: https://postgr.es/m/20180920234040.GC29981@momjian.us
1 parent 6eb3eb5 commit 82ff0cc
Copy full SHA for 82ff0cc

File tree

Expand file treeCollapse file tree

5 files changed

+91
-8
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+91
-8
lines changed

‎src/backend/access/transam/xact.c

Copy file name to clipboardExpand all lines: src/backend/access/transam/xact.c
+14-8Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,20 +1887,26 @@ StartTransaction(void)
18871887
TRACE_POSTGRESQL_TRANSACTION_START(vxid.localTransactionId);
18881888

18891889
/*
1890-
* set transaction_timestamp() (a/k/a now()). We want this to be the same
1891-
* as the first command's statement_timestamp(), so don't do a fresh
1892-
* GetCurrentTimestamp() call (which'd be expensive anyway). In a
1893-
* parallel worker, this should already have been provided by a call to
1890+
* set transaction_timestamp() (a/k/a now()). Normally, we want this to
1891+
* be the same as the first command's statement_timestamp(), so don't do a
1892+
* fresh GetCurrentTimestamp() call (which'd be expensive anyway). But
1893+
* for transactions started inside procedures (i.e., nonatomic SPI
1894+
* contexts), we do need to advance the timestamp. Also, in a parallel
1895+
* worker, the timestamp should already have been provided by a call to
18941896
* SetParallelStartTimestamps().
1895-
*
1896-
* Also, mark xactStopTimestamp as unset.
18971897
*/
18981898
if (!IsParallelWorker())
1899-
xactStartTimestamp = stmtStartTimestamp;
1899+
{
1900+
if (!SPI_inside_nonatomic_context())
1901+
xactStartTimestamp = stmtStartTimestamp;
1902+
else
1903+
xactStartTimestamp = GetCurrentTimestamp();
1904+
}
19001905
else
19011906
Assert(xactStartTimestamp != 0);
1902-
xactStopTimestamp = 0;
19031907
pgstat_report_xact_timestamp(xactStartTimestamp);
1908+
/* Mark xactStopTimestamp as unset. */
1909+
xactStopTimestamp = 0;
19041910

19051911
/*
19061912
* initialize current transaction state fields

‎src/backend/executor/spi.c

Copy file name to clipboardExpand all lines: src/backend/executor/spi.c
+13Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,19 @@ AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid)
423423
}
424424
}
425425

426+
/*
427+
* Are we executing inside a procedure (that is, a nonatomic SPI context)?
428+
*/
429+
bool
430+
SPI_inside_nonatomic_context(void)
431+
{
432+
if (_SPI_current == NULL)
433+
return false; /* not in any SPI context at all */
434+
if (_SPI_current->atomic)
435+
return false; /* it's atomic (ie function not procedure) */
436+
return true;
437+
}
438+
426439

427440
/* Parse, plan, and execute a query string */
428441
int

‎src/include/executor/spi.h

Copy file name to clipboardExpand all lines: src/include/executor/spi.h
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,5 +166,6 @@ extern void SPI_rollback(void);
166166
extern void SPICleanup(void);
167167
extern void AtEOXact_SPI(bool isCommit);
168168
extern void AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid);
169+
extern bool SPI_inside_nonatomic_context(void);
169170

170171
#endif /* SPI_H */

‎src/pl/plpgsql/src/expected/plpgsql_transaction.out

Copy file name to clipboardExpand all lines: src/pl/plpgsql/src/expected/plpgsql_transaction.out
+30Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,36 @@ CALL transaction_test10b(10);
493493
9
494494
(1 row)
495495

496+
-- transaction timestamp vs. statement timestamp
497+
CREATE PROCEDURE transaction_test11()
498+
LANGUAGE plpgsql
499+
AS $$
500+
DECLARE
501+
s1 timestamp with time zone;
502+
s2 timestamp with time zone;
503+
s3 timestamp with time zone;
504+
t1 timestamp with time zone;
505+
t2 timestamp with time zone;
506+
t3 timestamp with time zone;
507+
BEGIN
508+
s1 := statement_timestamp();
509+
t1 := transaction_timestamp();
510+
ASSERT s1 = t1;
511+
PERFORM pg_sleep(0.001);
512+
COMMIT;
513+
s2 := statement_timestamp();
514+
t2 := transaction_timestamp();
515+
ASSERT s2 = s1;
516+
ASSERT t2 > t1;
517+
PERFORM pg_sleep(0.001);
518+
ROLLBACK;
519+
s3 := statement_timestamp();
520+
t3 := transaction_timestamp();
521+
ASSERT s3 = s1;
522+
ASSERT t3 > t2;
523+
END;
524+
$$;
525+
CALL transaction_test11();
496526
DROP TABLE test1;
497527
DROP TABLE test2;
498528
DROP TABLE test3;

‎src/pl/plpgsql/src/sql/plpgsql_transaction.sql

Copy file name to clipboardExpand all lines: src/pl/plpgsql/src/sql/plpgsql_transaction.sql
+33Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,39 @@ $$;
412412
CALL transaction_test10b(10);
413413

414414

415+
-- transaction timestamp vs. statement timestamp
416+
CREATE PROCEDURE transaction_test11()
417+
LANGUAGE plpgsql
418+
AS $$
419+
DECLARE
420+
s1 timestamp with time zone;
421+
s2 timestamp with time zone;
422+
s3 timestamp with time zone;
423+
t1 timestamp with time zone;
424+
t2 timestamp with time zone;
425+
t3 timestamp with time zone;
426+
BEGIN
427+
s1 := statement_timestamp();
428+
t1 := transaction_timestamp();
429+
ASSERT s1 = t1;
430+
PERFORM pg_sleep(0.001);
431+
COMMIT;
432+
s2 := statement_timestamp();
433+
t2 := transaction_timestamp();
434+
ASSERT s2 = s1;
435+
ASSERT t2 > t1;
436+
PERFORM pg_sleep(0.001);
437+
ROLLBACK;
438+
s3 := statement_timestamp();
439+
t3 := transaction_timestamp();
440+
ASSERT s3 = s1;
441+
ASSERT t3 > t2;
442+
END;
443+
$$;
444+
445+
CALL transaction_test11();
446+
447+
415448
DROP TABLE test1;
416449
DROP TABLE test2;
417450
DROP TABLE test3;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.