Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commita98a040

Browse files
committed
Avoid Assert failure when processing empty statement in aborted xact.
exec_parse_message() wants to create a cached plan in all cases,including for empty input. The empty-input path does not havea test for being in an aborted transaction, making it possiblethat plancache.c will fail due to trying to do database lookupseven though there's no real work to do.One solution would be to throw an aborted-transaction error inthis path too, but it's not entirely clear whether the lack ofsuch an error was intentional or whether some clients might berelying on non-error behavior. Instead, let's hack plancache.cso that it treats empty statements with the same logic italready had for transaction control commands, ensuring that itcan soldier through even in an already-aborted transaction.Per bug #17983 from Alexander Lakhin. Back-patch to allsupported branches.Discussion:https://postgr.es/m/17983-da4569fcb878672e@postgresql.org
1 parent0e73b9a commita98a040

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

‎src/backend/utils/cache/plancache.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,11 @@
7878
/*
7979
* We must skip "overhead" operations that involve database access when the
8080
* cached plan's subject statement is a transaction control command.
81+
* For the convenience of postgres.c, treat empty statements as control
82+
* commands too.
8183
*/
8284
#defineIsTransactionStmtPlan(plansource) \
83-
((plansource)->raw_parse_tree&& \
85+
((plansource)->raw_parse_tree== NULL || \
8486
IsA((plansource)->raw_parse_tree->stmt, TransactionStmt))
8587

8688
/*

‎src/test/regress/expected/psql.out

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,17 @@ SELECT 3 AS x, 'Hello', 4 AS y, true AS "dirty\name" \gdesc \g
215215
3 | Hello | 4 | t
216216
(1 row)
217217

218+
-- test for server bug #17983 with empty statement in aborted transaction
219+
set search_path = default;
220+
begin;
221+
bogus;
222+
ERROR: syntax error at or near "bogus"
223+
LINE 1: bogus;
224+
^
225+
;
226+
\gdesc
227+
The command has no result, or the result has no columns.
228+
rollback;
218229
-- \gexec
219230
create temporary table gexec_test(a int, b text, c date, d float);
220231
select format('create index on gexec_test(%I)', attname)

‎src/test/regress/sql/psql.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,14 @@ SELECT 1 AS x, 'Hello', 2 AS y, true AS "dirty\name"
112112
-- all on one line
113113
SELECT3AS x,'Hello',4AS y, trueAS"dirty\name" \gdesc \g
114114

115+
-- test for server bug #17983 with empty statement in aborted transaction
116+
set search_path= default;
117+
begin;
118+
bogus;
119+
;
120+
\gdesc
121+
rollback;
122+
115123
-- \gexec
116124

117125
create temporary table gexec_test(aint, btext, cdate, d float);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp