mirror of
https://github.com/postgres/postgres.git
synced 2026-02-11 06:43:59 -05:00
2e517818f4
SPI_commit previously left it up to the caller to recover from any error occurring during commit. Since that's complicated and requires use of low-level xact.c facilities, it's not too surprising that no caller got it right. Let's move the responsibility for cleanup into spi.c. Doing that requires redefining SPI_commit as starting a new transaction, so that it becomes equivalent to SPI_commit_and_chain except that you get default transaction characteristics instead of preserving the prior transaction's characteristics. We can make this pretty transparent API-wise by redefining SPI_start_transaction() as a no-op. Callers that expect to do something in between might be surprised, but available evidence is that no callers do so. Having made that API redefinition, we can fix this mess by having SPI_commit[_and_chain] trap errors and start a new, clean transaction before re-throwing the error. Likewise for SPI_rollback[_and_chain]. Some cleanup is also needed in AtEOXact_SPI, which was nowhere near smart enough to deal with SPI contexts nested inside a committing context. While plperl and pltcl need no changes beyond removing their now-useless SPI_start_transaction() calls, plpython needs some more work because it hadn't gotten the memo about catching commit/rollback errors in the first place. Such an error resulted in longjmp'ing out of the Python interpreter, which leaks Python stack entries at present and is reported to crash Python 3.11 altogether. Add the missing logic to catch such errors and convert them into Python exceptions. We are probably going to have to back-patch this once Python 3.11 ships, but it's a sufficiently basic change that I'm a bit nervous about doing so immediately. Let's let it bake awhile in HEAD first. Peter Eisentraut and Tom Lane Discussion: https://postgr.es/m/3375ffd8-d71c-2565-e348-a597d6e739e3@enterprisedb.com Discussion: https://postgr.es/m/17416-ed8fe5d7213d6c25@postgresql.org
182 lines
3.4 KiB
PL/PgSQL
182 lines
3.4 KiB
PL/PgSQL
CREATE TABLE test1 (a int, b text);
|
|
|
|
|
|
CREATE PROCEDURE transaction_test1()
|
|
LANGUAGE plpythonu
|
|
AS $$
|
|
for i in range(0, 10):
|
|
plpy.execute("INSERT INTO test1 (a) VALUES (%d)" % i)
|
|
if i % 2 == 0:
|
|
plpy.commit()
|
|
else:
|
|
plpy.rollback()
|
|
$$;
|
|
|
|
CALL transaction_test1();
|
|
|
|
SELECT * FROM test1;
|
|
|
|
|
|
TRUNCATE test1;
|
|
|
|
DO
|
|
LANGUAGE plpythonu
|
|
$$
|
|
for i in range(0, 10):
|
|
plpy.execute("INSERT INTO test1 (a) VALUES (%d)" % i)
|
|
if i % 2 == 0:
|
|
plpy.commit()
|
|
else:
|
|
plpy.rollback()
|
|
$$;
|
|
|
|
SELECT * FROM test1;
|
|
|
|
|
|
TRUNCATE test1;
|
|
|
|
-- not allowed in a function
|
|
CREATE FUNCTION transaction_test2() RETURNS int
|
|
LANGUAGE plpythonu
|
|
AS $$
|
|
for i in range(0, 10):
|
|
plpy.execute("INSERT INTO test1 (a) VALUES (%d)" % i)
|
|
if i % 2 == 0:
|
|
plpy.commit()
|
|
else:
|
|
plpy.rollback()
|
|
return 1
|
|
$$;
|
|
|
|
SELECT transaction_test2();
|
|
|
|
SELECT * FROM test1;
|
|
|
|
|
|
-- also not allowed if procedure is called from a function
|
|
CREATE FUNCTION transaction_test3() RETURNS int
|
|
LANGUAGE plpythonu
|
|
AS $$
|
|
plpy.execute("CALL transaction_test1()")
|
|
return 1
|
|
$$;
|
|
|
|
SELECT transaction_test3();
|
|
|
|
SELECT * FROM test1;
|
|
|
|
|
|
-- DO block inside function
|
|
CREATE FUNCTION transaction_test4() RETURNS int
|
|
LANGUAGE plpythonu
|
|
AS $$
|
|
plpy.execute("DO LANGUAGE plpythonu $x$ plpy.commit() $x$")
|
|
return 1
|
|
$$;
|
|
|
|
SELECT transaction_test4();
|
|
|
|
|
|
-- commit inside subtransaction (prohibited)
|
|
DO LANGUAGE plpythonu $$
|
|
s = plpy.subtransaction()
|
|
s.enter()
|
|
plpy.commit()
|
|
$$;
|
|
|
|
|
|
-- commit inside cursor loop
|
|
CREATE TABLE test2 (x int);
|
|
INSERT INTO test2 VALUES (0), (1), (2), (3), (4);
|
|
|
|
TRUNCATE test1;
|
|
|
|
DO LANGUAGE plpythonu $$
|
|
for row in plpy.cursor("SELECT * FROM test2 ORDER BY x"):
|
|
plpy.execute("INSERT INTO test1 (a) VALUES (%s)" % row['x'])
|
|
plpy.commit()
|
|
$$;
|
|
|
|
SELECT * FROM test1;
|
|
|
|
-- check that this doesn't leak a holdable portal
|
|
SELECT * FROM pg_cursors;
|
|
|
|
|
|
-- error in cursor loop with commit
|
|
TRUNCATE test1;
|
|
|
|
DO LANGUAGE plpythonu $$
|
|
for row in plpy.cursor("SELECT * FROM test2 ORDER BY x"):
|
|
plpy.execute("INSERT INTO test1 (a) VALUES (12/(%s-2))" % row['x'])
|
|
plpy.commit()
|
|
$$;
|
|
|
|
SELECT * FROM test1;
|
|
|
|
SELECT * FROM pg_cursors;
|
|
|
|
|
|
-- rollback inside cursor loop
|
|
TRUNCATE test1;
|
|
|
|
DO LANGUAGE plpythonu $$
|
|
for row in plpy.cursor("SELECT * FROM test2 ORDER BY x"):
|
|
plpy.execute("INSERT INTO test1 (a) VALUES (%s)" % row['x'])
|
|
plpy.rollback()
|
|
$$;
|
|
|
|
SELECT * FROM test1;
|
|
|
|
SELECT * FROM pg_cursors;
|
|
|
|
|
|
-- first commit then rollback inside cursor loop
|
|
TRUNCATE test1;
|
|
|
|
DO LANGUAGE plpythonu $$
|
|
for row in plpy.cursor("SELECT * FROM test2 ORDER BY x"):
|
|
plpy.execute("INSERT INTO test1 (a) VALUES (%s)" % row['x'])
|
|
if row['x'] % 2 == 0:
|
|
plpy.commit()
|
|
else:
|
|
plpy.rollback()
|
|
$$;
|
|
|
|
SELECT * FROM test1;
|
|
|
|
SELECT * FROM pg_cursors;
|
|
|
|
|
|
-- check handling of an error during COMMIT
|
|
CREATE TABLE testpk (id int PRIMARY KEY);
|
|
CREATE TABLE testfk(f1 int REFERENCES testpk DEFERRABLE INITIALLY DEFERRED);
|
|
|
|
DO LANGUAGE plpythonu $$
|
|
# this insert will fail during commit:
|
|
plpy.execute("INSERT INTO testfk VALUES (0)")
|
|
plpy.commit()
|
|
plpy.warning('should not get here')
|
|
$$;
|
|
|
|
SELECT * FROM testpk;
|
|
SELECT * FROM testfk;
|
|
|
|
DO LANGUAGE plpythonu $$
|
|
# this insert will fail during commit:
|
|
plpy.execute("INSERT INTO testfk VALUES (0)")
|
|
try:
|
|
plpy.commit()
|
|
except Exception as e:
|
|
plpy.info('sqlstate: %s' % (e.sqlstate))
|
|
# these inserts should work:
|
|
plpy.execute("INSERT INTO testpk VALUES (1)")
|
|
plpy.execute("INSERT INTO testfk VALUES (1)")
|
|
$$;
|
|
|
|
SELECT * FROM testpk;
|
|
SELECT * FROM testfk;
|
|
|
|
|
|
DROP TABLE test1;
|
|
DROP TABLE test2;
|