postgres.git / summary / log / commit / refs

commit    8a55cb5ba9655ffb1cf0a3042aaa6f5eef8c5a85
Author:   Fujii Masao <fujii@postgresql.org>
Date:     Fri Feb 19 12:57:52 2021 +0000
First released in: 14.0, 12.7, 13.3

    Fix bug in COMMIT AND CHAIN command.
    
    This commit fixes COMMIT AND CHAIN command so that it starts new transaction
    immediately even if savepoints are defined within the transaction to commit.
    Previously COMMIT AND CHAIN command did not in that case because
    commit 280a408b48 forgot to make CommitTransactionCommand() handle
    a transaction chaining when the transaction state was TBLOCK_SUBCOMMIT.
    
    Also this commit adds the regression test for COMMIT AND CHAIN command
    when savepoints are defined.
    
    Back-patch to v12 where transaction chaining was added.
    
    Reported-by: Arthur Nascimento
    Author: Fujii Masao
    Reviewed-by: Arthur Nascimento, Vik Fearing
    Discussion: https://postgr.es/m/16867-3475744069228158@postgresql.org


src/backend/access/transam/xact.c | 7 ++++++ src/test/regress/expected/transactions.out | 40 ++++++++++++++++++++++++++++++ src/test/regress/sql/transactions.sql | 11 ++++++++ 3 files changed, 58 insertions(+) diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 17fbc41bbb7..4e6a3df6b87 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -3105,6 +3105,13 @@ CommitTransactionCommand(void) Assert(s->parent == NULL); CommitTransaction(); s->blockState = TBLOCK_DEFAULT; + if (s->chain) + { + StartTransaction(); + s->blockState = TBLOCK_INPROGRESS; + s->chain = false; + RestoreTransactionCharacteristics(); + } } else if (s->blockState == TBLOCK_PREPARE) { diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out index 1b033100298..75dc6558d82 100644 --- a/src/test/regress/expected/transactions.out +++ b/src/test/regress/expected/transactions.out @@ -774,6 +774,46 @@ SHOW transaction_deferrable; (1 row) INSERT INTO abc VALUES (5); +COMMIT; +START TRANSACTION ISOLATION LEVEL REPEATABLE READ, READ WRITE, DEFERRABLE; +SHOW transaction_isolation; + transaction_isolation +----------------------- + repeatable read +(1 row) + +SHOW transaction_read_only; + transaction_read_only +----------------------- + off +(1 row) + +SHOW transaction_deferrable; + transaction_deferrable +------------------------ + on +(1 row) + +SAVEPOINT x; +COMMIT AND CHAIN; -- TBLOCK_SUBCOMMIT +SHOW transaction_isolation; + transaction_isolation +----------------------- + repeatable read +(1 row) + +SHOW transaction_read_only; + transaction_read_only +----------------------- + off +(1 row) + +SHOW transaction_deferrable; + transaction_deferrable +------------------------ + on +(1 row) + COMMIT; -- different mix of options just for fun START TRANSACTION ISOLATION LEVEL SERIALIZABLE, READ WRITE, NOT DEFERRABLE; diff --git a/src/test/regress/sql/transactions.sql b/src/test/regress/sql/transactions.sql index bf1016489d1..d1b6ed0280d 100644 --- a/src/test/regress/sql/transactions.sql +++ b/src/test/regress/sql/transactions.sql @@ -458,6 +458,17 @@ SHOW transaction_deferrable; INSERT INTO abc VALUES (5); COMMIT; +START TRANSACTION ISOLATION LEVEL REPEATABLE READ, READ WRITE, DEFERRABLE; +SHOW transaction_isolation; +SHOW transaction_read_only; +SHOW transaction_deferrable; +SAVEPOINT x; +COMMIT AND CHAIN; -- TBLOCK_SUBCOMMIT +SHOW transaction_isolation; +SHOW transaction_read_only; +SHOW transaction_deferrable; +COMMIT; + -- different mix of options just for fun START TRANSACTION ISOLATION LEVEL SERIALIZABLE, READ WRITE, NOT DEFERRABLE; SHOW transaction_isolation; [parent: 678d0e239b67]