Skip to content

Commit cc813fc

Browse files
tglsfdctglsfdc
committed
Replace nested-BEGIN syntax for subtransactions with spec-compliant
SAVEPOINT/RELEASE/ROLLBACK-TO syntax. (Alvaro) Cause COMMIT of a failed transaction to report ROLLBACK instead of COMMIT in its command tag. (Tom) Fix a few loose ends in the nested-transactions stuff.
1 parent b1ee938 commit cc813fc

File tree

13 files changed

+929
-275
lines changed

13 files changed

+929
-275
lines changed

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

Lines changed: 490 additions & 120 deletions
Large diffs are not rendered by default.

‎src/backend/executor/spi.c‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.120 2004/07/01 21:17:13 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.121 2004/07/27 05:10:51 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1181,18 +1181,16 @@ _SPI_execute(const char *src, int tcount, _SPI_plan *plan)
11811181
res = SPI_ERROR_CURSOR;
11821182
goto fail;
11831183
}
1184+
else if (IsA(queryTree->utilityStmt, TransactionStmt))
1185+
{
1186+
res = SPI_ERROR_TRANSACTION;
1187+
goto fail;
1188+
}
11841189
res = SPI_OK_UTILITY;
11851190
if (plan == NULL)
11861191
{
11871192
ProcessUtility(queryTree->utilityStmt, dest, NULL);
1188-
1189-
if (IsA(queryTree->utilityStmt, TransactionStmt))
1190-
{
1191-
CommitTransactionCommand();
1192-
StartTransactionCommand();
1193-
}
1194-
else
1195-
CommandCounterIncrement();
1193+
CommandCounterIncrement();
11961194
}
11971195
}
11981196
else if (plan == NULL)
@@ -1308,14 +1306,7 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
13081306
{
13091307
ProcessUtility(queryTree->utilityStmt, dest, NULL);
13101308
res = SPI_OK_UTILITY;
1311-
1312-
if (IsA(queryTree->utilityStmt, TransactionStmt))
1313-
{
1314-
CommitTransactionCommand();
1315-
StartTransactionCommand();
1316-
}
1317-
else
1318-
CommandCounterIncrement();
1309+
CommandCounterIncrement();
13191310
}
13201311
else
13211312
{

‎src/backend/parser/gram.y‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.467 2004/07/12 05:37:44 tgl Exp $
14+
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.468 2004/07/27 05:10:55 tgl Exp $
1515
*
1616
* HISTORY
1717
* AUTHOR DATE MAJOR EVENT
@@ -386,11 +386,11 @@ static void doNegateFloat(Value *v);
386386

387387
QUOTE
388388

389-
READ REAL RECHECK REFERENCES REINDEX RELATIVE_P RENAME REPEATABLE REPLACE
390-
RESET RESTART RESTRICT RETURNS REVOKE RIGHT ROLLBACK ROW ROWS
391-
RULE
389+
READ REAL RECHECK REFERENCES REINDEX RELATIVE_P RELEASE RENAME
390+
REPEATABLE REPLACE RESET RESTART RESTRICT RETURNS REVOKE RIGHT
391+
ROLLBACK ROW ROWS RULE
392392

393-
SCHEMA SCROLL SECOND_P SECURITY SELECT SEQUENCE
393+
SAVEPOINT SCHEMA SCROLL SECOND_P SECURITY SELECT SEQUENCE
394394
SERIALIZABLE SESSION SESSION_USER SET SETOF SHARE
395395
SHOW SIMILAR SIMPLE SMALLINT SOME STABLE START STATEMENT
396396
STATISTICS STDIN STDOUT STORAGE STRICT_P SUBSTRING SYSID
@@ -3961,6 +3961,30 @@ TransactionStmt:
39613961
n->options = NIL;
39623962
$$ = (Node *)n;
39633963
}
3964+
| SAVEPOINT ColId
3965+
{
3966+
TransactionStmt *n = makeNode(TransactionStmt);
3967+
n->kind = TRANS_STMT_SAVEPOINT;
3968+
n->options = list_make1(makeDefElem("savepoint_name",
3969+
(Node *)makeString($2)));
3970+
$$ = (Node *)n;
3971+
}
3972+
| RELEASE ColId
3973+
{
3974+
TransactionStmt *n = makeNode(TransactionStmt);
3975+
n->kind = TRANS_STMT_RELEASE;
3976+
n->options = list_make1(makeDefElem("savepoint_name",
3977+
(Node *)makeString($2)));
3978+
$$ = (Node *)n;
3979+
}
3980+
| ROLLBACK TO ColId
3981+
{
3982+
TransactionStmt *n = makeNode(TransactionStmt);
3983+
n->kind = TRANS_STMT_ROLLBACK_TO;
3984+
n->options = list_make1(makeDefElem("savepoint_name",
3985+
(Node *)makeString($3)));
3986+
$$ = (Node *)n;
3987+
}
39643988
;
39653989

39663990
opt_transaction: WORK {}
@@ -7688,6 +7712,7 @@ unreserved_keyword:
76887712
| RECHECK
76897713
| REINDEX
76907714
| RELATIVE_P
7715+
| RELEASE
76917716
| RENAME
76927717
| REPEATABLE
76937718
| REPLACE
@@ -7699,6 +7724,7 @@ unreserved_keyword:
76997724
| ROLLBACK
77007725
| ROWS
77017726
| RULE
7727+
| SAVEPOINT
77027728
| SCHEMA
77037729
| SCROLL
77047730
| SECOND_P

‎src/backend/parser/keywords.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.151 2004/07/12 05:37:44 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.152 2004/07/27 05:10:55 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -254,6 +254,7 @@ static const ScanKeyword ScanKeywords[] = {
254254
{"references", REFERENCES},
255255
{"reindex", REINDEX},
256256
{"relative", RELATIVE_P},
257+
{"release", RELEASE},
257258
{"rename", RENAME},
258259
{"repeatable", REPEATABLE},
259260
{"replace", REPLACE},
@@ -267,6 +268,7 @@ static const ScanKeyword ScanKeywords[] = {
267268
{"row", ROW},
268269
{"rows", ROWS},
269270
{"rule", RULE},
271+
{"savepoint", SAVEPOINT},
270272
{"schema", SCHEMA},
271273
{"scroll", SCROLL},
272274
{"second", SECOND_P},

‎src/backend/storage/lmgr/lmgr.c‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/storage/lmgr/lmgr.c,v 1.64 2004/07/01 00:50:59 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/storage/lmgr/lmgr.c,v 1.65 2004/07/27 05:10:58 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -334,21 +334,23 @@ XactLockTableInsert(TransactionId xid)
334334
* XactLockTableWait
335335
*
336336
* Wait for the specified transaction to commit or abort.
337-
* We actually wait on the topmost transaction of the transaction tree.
337+
*
338+
* Note that this does the right thing for subtransactions: if we
339+
* wait on a subtransaction, we will be awakened as soon as it aborts
340+
* or its parent commits.
338341
*/
339342
void
340343
XactLockTableWait(TransactionId xid)
341344
{
342345
LOCKTAG tag;
343346
TransactionId myxid = GetCurrentTransactionId();
344-
TransactionId waitXid = SubTransGetTopmostTransaction(xid);
345347

346-
Assert(!SubTransXidsHaveCommonAncestor(waitXid, myxid));
348+
Assert(!SubTransXidsHaveCommonAncestor(xid, myxid));
347349

348350
MemSet(&tag, 0, sizeof(tag));
349351
tag.relId = XactLockTableId;
350352
tag.dbId = InvalidOid;
351-
tag.objId.xid = waitXid;
353+
tag.objId.xid = xid;
352354

353355
if (!LockAcquire(LockTableId, &tag, myxid,
354356
ShareLock, false))
@@ -358,13 +360,8 @@ XactLockTableWait(TransactionId xid)
358360

359361
/*
360362
* Transaction was committed/aborted/crashed - we have to update
361-
* pg_clog if transaction is still marked as running. If it's a
362-
* subtransaction, we can update the parent status too.
363+
* pg_clog if transaction is still marked as running.
363364
*/
364-
if (!TransactionIdDidCommit(waitXid) && !TransactionIdDidAbort(waitXid))
365-
{
366-
TransactionIdAbort(waitXid);
367-
if (waitXid != xid)
368-
TransactionIdAbort(xid);
369-
}
365+
if (!TransactionIdDidCommit(xid) && !TransactionIdDidAbort(xid))
366+
TransactionIdAbort(xid);
370367
}

‎src/backend/tcop/postgres.c‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.424 2004/07/17 03:29:00 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.425 2004/07/27 05:11:03 tgl Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -841,8 +841,8 @@ exec_simple_query(const char *query_string)
841841
TransactionStmt *stmt = (TransactionStmt *) parsetree;
842842

843843
if (stmt->kind == TRANS_STMT_COMMIT ||
844-
stmt->kind == TRANS_STMT_BEGIN ||
845-
stmt->kind == TRANS_STMT_ROLLBACK)
844+
stmt->kind == TRANS_STMT_ROLLBACK ||
845+
stmt->kind == TRANS_STMT_ROLLBACK_TO)
846846
allowit = true;
847847
}
848848

@@ -1162,8 +1162,8 @@ exec_parse_message(const char *query_string, /* string to execute */
11621162
TransactionStmt *stmt = (TransactionStmt *) parsetree;
11631163

11641164
if (stmt->kind == TRANS_STMT_COMMIT ||
1165-
stmt->kind == TRANS_STMT_BEGIN ||
1166-
stmt->kind == TRANS_STMT_ROLLBACK)
1165+
stmt->kind == TRANS_STMT_ROLLBACK ||
1166+
stmt->kind == TRANS_STMT_ROLLBACK_TO)
11671167
allowit = true;
11681168
}
11691169

@@ -1625,8 +1625,8 @@ exec_execute_message(const char *portal_name, long max_rows)
16251625

16261626
is_trans_stmt = true;
16271627
if (stmt->kind == TRANS_STMT_COMMIT ||
1628-
stmt->kind == TRANS_STMT_BEGIN ||
1629-
stmt->kind == TRANS_STMT_ROLLBACK)
1628+
stmt->kind == TRANS_STMT_ROLLBACK ||
1629+
stmt->kind == TRANS_STMT_ROLLBACK_TO)
16301630
is_trans_exit = true;
16311631
}
16321632
}
@@ -2810,6 +2810,9 @@ PostgresMain(int argc, char *argv[], const char *username)
28102810
*/
28112811
MemoryContextSwitchTo(ErrorContext);
28122812

2813+
/* Make sure we are using a sane ResourceOwner, too */
2814+
CurrentResourceOwner = CurTransactionResourceOwner;
2815+
28132816
/* Do the recovery */
28142817
ereport(DEBUG2,
28152818
(errmsg_internal("AbortCurrentTransaction")));

‎src/backend/tcop/utility.c‎

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.220 2004/06/25 21:55:57 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/tcop/utility.c,v 1.221 2004/07/27 05:11:03 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -354,12 +354,51 @@ ProcessUtility(Node *parsetree,
354354
break;
355355

356356
case TRANS_STMT_COMMIT:
357-
EndTransactionBlock();
357+
if (!EndTransactionBlock())
358+
{
359+
/* report unsuccessful commit in completionTag */
360+
if (completionTag)
361+
strcpy(completionTag, "ROLLBACK");
362+
}
358363
break;
359364

360365
case TRANS_STMT_ROLLBACK:
361366
UserAbortTransactionBlock();
362367
break;
368+
369+
case TRANS_STMT_SAVEPOINT:
370+
{
371+
ListCell *cell;
372+
char *name = NULL;
373+
374+
RequireTransactionChain((void *)stmt, "SAVEPOINT");
375+
376+
foreach (cell, stmt->options)
377+
{
378+
DefElem *elem = lfirst(cell);
379+
if (strcmp(elem->defname, "savepoint_name") == 0)
380+
name = strVal(elem->arg);
381+
}
382+
383+
Assert(PointerIsValid(name));
384+
385+
DefineSavepoint(name);
386+
}
387+
break;
388+
389+
case TRANS_STMT_RELEASE:
390+
RequireTransactionChain((void *)stmt, "RELEASE");
391+
ReleaseSavepoint(stmt->options);
392+
break;
393+
394+
case TRANS_STMT_ROLLBACK_TO:
395+
RequireTransactionChain((void *)stmt, "ROLLBACK TO");
396+
RollbackToSavepoint(stmt->options);
397+
/*
398+
* CommitTransactionCommand is in charge
399+
* of re-defining the savepoint again
400+
*/
401+
break;
363402
}
364403
}
365404
break;
@@ -1114,9 +1153,18 @@ CreateCommandTag(Node *parsetree)
11141153
break;
11151154

11161155
case TRANS_STMT_ROLLBACK:
1156+
case TRANS_STMT_ROLLBACK_TO:
11171157
tag = "ROLLBACK";
11181158
break;
11191159

1160+
case TRANS_STMT_SAVEPOINT:
1161+
tag = "SAVEPOINT";
1162+
break;
1163+
1164+
case TRANS_STMT_RELEASE:
1165+
tag = "RELEASE";
1166+
break;
1167+
11201168
default:
11211169
tag = "???";
11221170
break;

‎src/bin/psql/tab-complete.c‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright (c) 2000-2003, PostgreSQL Global Development Group
55
*
6-
* $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.107 2004/05/26 13:56:55 momjian Exp $
6+
* $PostgreSQL: pgsql/src/bin/psql/tab-complete.c,v 1.108 2004/07/27 05:11:11 tgl Exp $
77
*/
88

99
/*----------------------------------------------------------------------
@@ -463,8 +463,8 @@ psql_completion(char *text, int start, int end)
463463
"ABORT", "ALTER", "ANALYZE", "BEGIN", "CHECKPOINT", "CLOSE", "CLUSTER", "COMMENT",
464464
"COMMIT", "COPY", "CREATE", "DEALLOCATE", "DECLARE", "DELETE", "DROP", "EXECUTE",
465465
"EXPLAIN", "FETCH", "GRANT", "INSERT", "LISTEN", "LOAD", "LOCK", "MOVE", "NOTIFY",
466-
"PREPARE", "REINDEX", "RESET", "REVOKE", "ROLLBACK", "SELECT", "SET", "SHOW", "START",
467-
"TRUNCATE", "UNLISTEN", "UPDATE", "VACUUM", NULL
466+
"PREPARE", "REINDEX", "RELEASE", "RESET", "REVOKE", "ROLLBACK", "SAVEPOINT",
467+
"SELECT", "SET", "SHOW", "START", "TRUNCATE", "UNLISTEN", "UPDATE", "VACUUM", NULL
468468
};
469469

470470
static const char * const pgsql_variables[] = {
@@ -722,16 +722,23 @@ psql_completion(char *text, int start, int end)
722722
else if (pg_strcasecmp(prev2_wd, "ANALYZE") == 0)
723723
COMPLETE_WITH_CONST(";");
724724

725-
/* BEGIN, COMMIT, ROLLBACK, ABORT, */
725+
/* BEGIN, COMMIT, ABORT */
726726
else if (pg_strcasecmp(prev_wd, "BEGIN") == 0 ||
727727
pg_strcasecmp(prev_wd, "END") == 0 ||
728728
pg_strcasecmp(prev_wd, "COMMIT") == 0 ||
729-
pg_strcasecmp(prev_wd, "ROLLBACK") == 0 ||
730729
pg_strcasecmp(prev_wd, "ABORT") == 0)
731730
{
732731
static const char * const list_TRANS[] =
733732
{"WORK", "TRANSACTION", NULL};
734733

734+
COMPLETE_WITH_LIST(list_TRANS);
735+
}
736+
/* ROLLBACK*/
737+
else if ( pg_strcasecmp(prev_wd, "ROLLBACK") == 0 )
738+
{
739+
static const char * const list_TRANS[] =
740+
{"WORK", "TRANSACTION", "TO", NULL};
741+
735742
COMPLETE_WITH_LIST(list_TRANS);
736743
}
737744
/* CLUSTER */

0 commit comments

Comments
 (0)