*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.86 2006/04/04 19:35:35 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.87 2006/06/11 15:49:28 tgl Exp $
*
* NOTES
* This cruft is the server side of PQfn.
#include "miscadmin.h"
#include "mb/pg_wchar.h"
#include "tcop/fastpath.h"
+#include "tcop/tcopprot.h"
#include "utils/acl.h"
#include "utils/lsyscache.h"
#include "utils/syscache.h"
"commands ignored until end of transaction block")));
/*
+ * Now that we know we are in a valid transaction, set snapshot in
+ * case needed by function itself or one of the datatype I/O routines.
+ */
+ ActiveSnapshot = CopySnapshot(GetTransactionSnapshot());
+
+ /*
* Begin parsing the buffer contents.
*/
if (PG_PROTOCOL_MAJOR(FrontendProtocol) < 3)
- (void) pq_getmsgstring(msgBuf); /* dummy string */
+ (void) pq_getmsgstring(msgBuf); /* dummy string */
fid = (Oid) pq_getmsgint(msgBuf, 4); /* function oid */
+ if (log_statement == LOGSTMT_ALL)
+ ereport(LOG,
+ (errmsg("fastpath function call: function OID %u",
+ fid)));
+
/*
* There used to be a lame attempt at caching lookup info here. Now we
* just do the lookups on every call.
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.486 2006/04/25 00:25:18 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.487 2006/06/11 15:49:28 tgl Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
/* start an xact for this function invocation */
initialize_command();
+ /*
+ * Note: we may at this point be inside an aborted
+ * transaction. We can't throw error for that until
+ * we've finished reading the function-call message, so
+ * HandleFunctionRequest() must check for it after doing so.
+ * Be careful not to do anything that assumes we're inside a
+ * valid transaction here.
+ */
+
/* switch back to message context */
MemoryContextSwitchTo(MessageContext);
- /* set snapshot in case function needs one */
- ActiveSnapshot = CopySnapshot(GetTransactionSnapshot());
-
if (HandleFunctionRequest(&input_message) == EOF)
{
/* lost frontend connection during F message input */