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

Commitbf64a37

Browse files
committed
Fix Assert failure when a fastpath function call is attempted inside an
already-aborted transaction block. GetSnapshotData throws an Assert ifnot in a valid transaction; hence we mustn't attempt to set a snapshotfor the function until after checking for aborted transaction. This isharmless AFAICT if Asserts aren't enabled (GetSnapshotData will computea bogus snapshot, but it doesn't matter since HandleFunctionRequest willthrow an error shortly anywy). Hence, not a major bug.Along the way, add some ability to log fastpath calls when statementlogging is turned on. This could probably stand to be improved further,but not logging anything is clearly undesirable.Backpatched as far as 8.0; bug doesn't exist before that.
1 parent807bfa5 commitbf64a37

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

‎src/backend/tcop/fastpath.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.86 2006/04/04 19:35:35 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.87 2006/06/11 15:49:28 tgl Exp $
1212
*
1313
* NOTES
1414
* This cruft is the server side of PQfn.
@@ -26,6 +26,7 @@
2626
#include"miscadmin.h"
2727
#include"mb/pg_wchar.h"
2828
#include"tcop/fastpath.h"
29+
#include"tcop/tcopprot.h"
2930
#include"utils/acl.h"
3031
#include"utils/lsyscache.h"
3132
#include"utils/syscache.h"
@@ -299,14 +300,25 @@ HandleFunctionRequest(StringInfo msgBuf)
299300
errmsg("current transaction is aborted, "
300301
"commands ignored until end of transaction block")));
301302

303+
/*
304+
* Now that we know we are in a valid transaction, set snapshot in
305+
* case needed by function itself or one of the datatype I/O routines.
306+
*/
307+
ActiveSnapshot=CopySnapshot(GetTransactionSnapshot());
308+
302309
/*
303310
* Begin parsing the buffer contents.
304311
*/
305312
if (PG_PROTOCOL_MAJOR(FrontendProtocol)<3)
306-
(void)pq_getmsgstring(msgBuf);/* dummy string */
313+
(void)pq_getmsgstring(msgBuf);/* dummy string */
307314

308315
fid= (Oid)pq_getmsgint(msgBuf,4);/* function oid */
309316

317+
if (log_statement==LOGSTMT_ALL)
318+
ereport(LOG,
319+
(errmsg("fastpath function call: function OID %u",
320+
fid)));
321+
310322
/*
311323
* There used to be a lame attempt at caching lookup info here. Now we
312324
* just do the lookups on every call.

‎src/backend/tcop/postgres.c

Lines changed: 10 additions & 4 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.486 2006/04/25 00:25:18 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.487 2006/06/11 15:49:28 tgl Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -3344,12 +3344,18 @@ PostgresMain(int argc, char *argv[], const char *username)
33443344
/* start an xact for this function invocation */
33453345
initialize_command();
33463346

3347+
/*
3348+
* Note: we may at this point be inside an aborted
3349+
* transaction. We can't throw error for that until
3350+
* we've finished reading the function-call message, so
3351+
* HandleFunctionRequest() must check for it after doing so.
3352+
* Be careful not to do anything that assumes we're inside a
3353+
* valid transaction here.
3354+
*/
3355+
33473356
/* switch back to message context */
33483357
MemoryContextSwitchTo(MessageContext);
33493358

3350-
/* set snapshot in case function needs one */
3351-
ActiveSnapshot=CopySnapshot(GetTransactionSnapshot());
3352-
33533359
if (HandleFunctionRequest(&input_message)==EOF)
33543360
{
33553361
/* lost frontend connection during F message input */

0 commit comments

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