diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-09-10 18:40:09 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-09-10 18:40:09 +0000 |
| commit | b339d1fff6c2f14776af29a35c8550b222ca70b2 (patch) | |
| tree | be0ed19fa78e35cdde627d1c6bc4c4be9f7cb44e /src/backend/commands/explain.c | |
| parent | 856d1faac1024717b7c37665c46fd635dc52b1b4 (diff) | |
| download | postgresql-b339d1fff6c2f14776af29a35c8550b222ca70b2.tar.gz postgresql-b339d1fff6c2f14776af29a35c8550b222ca70b2.zip | |
Fire non-deferred AFTER triggers immediately upon query completion,
rather than when returning to the idle loop. This makes no particular
difference for interactively-issued queries, but it makes a big difference
for queries issued within functions: trigger execution now occurs before
the calling function is allowed to proceed. This responds to numerous
complaints about nonintuitive behavior of foreign key checking, such as
http://archives.postgresql.org/pgsql-bugs/2004-09/msg00020.php, and
appears to be required by the SQL99 spec.
Also take the opportunity to simplify the data structures used for the
pending-trigger list, rename them for more clarity, and squeeze out a
bit of space.
Diffstat (limited to 'src/backend/commands/explain.c')
| -rw-r--r-- | src/backend/commands/explain.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index 7ad3596fac6..9b7cf1ae491 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994-5, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.124 2004/08/29 05:06:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/explain.c,v 1.125 2004/09/10 18:39:56 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -18,6 +18,7 @@ #include "catalog/pg_type.h" #include "commands/explain.h" #include "commands/prepare.h" +#include "commands/trigger.h" #include "executor/executor.h" #include "executor/instrument.h" #include "lib/stringinfo.h" @@ -206,6 +207,10 @@ ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt, gettimeofday(&starttime, NULL); + /* If analyzing, we need to cope with queued triggers */ + if (stmt->analyze) + AfterTriggerBeginQuery(); + /* call ExecutorStart to prepare the plan for execution */ ExecutorStart(queryDesc, false, !stmt->analyze); @@ -255,12 +260,16 @@ ExplainOnePlan(QueryDesc *queryDesc, ExplainStmt *stmt, } /* - * Close down the query and free resources. Include time for this in - * the total runtime. + * Close down the query and free resources; also run any queued + * AFTER triggers. Include time for this in the total runtime. */ gettimeofday(&starttime, NULL); ExecutorEnd(queryDesc); + + if (stmt->analyze) + AfterTriggerEndQuery(); + FreeQueryDesc(queryDesc); CommandCounterIncrement(); |