diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-11-30 18:38:34 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-11-30 18:38:34 +0000 |
| commit | f0f18c7087e04a60e2612151401b07df87e51d96 (patch) | |
| tree | 37900cb71cee0dcbdb5f7b38157247cc81309c52 /src/backend/executor | |
| parent | 7c43106db263a7b54737bc576bb72caea8258a61 (diff) | |
| download | postgresql-f0f18c7087e04a60e2612151401b07df87e51d96.tar.gz postgresql-f0f18c7087e04a60e2612151401b07df87e51d96.zip | |
Repair bug that allowed RevalidateCachedPlan to attempt to rebuild a cached
plan before the effects of DDL executed in an immediately prior SPI operation
had been absorbed. Per report from Chris Wood.
This patch has an unpleasant side effect of causing the number of
CommandCounterIncrement()s done by a typical plpgsql function to
approximately double. Amelioration of the consequences of that
will be undertaken in a separate patch.
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/spi.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index 3d72fa20a55..a5601ecdfca 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.184 2007/11/15 21:14:35 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.185 2007/11/30 18:38:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1375,14 +1375,6 @@ _SPI_prepare_plan(const char *src, SPIPlanPtr plan) int cursor_options = plan->cursor_options; /* - * Increment CommandCounter to see changes made by now. We must do this - * to be sure of seeing any schema changes made by a just-preceding SPI - * command. (But we don't bother advancing the snapshot, since the - * planner generally operates under SnapshotNow rules anyway.) - */ - CommandCounterIncrement(); - - /* * Setup error traceback support for ereport() */ spierrcontext.callback = _SPI_error_callback; @@ -1662,6 +1654,14 @@ _SPI_execute_plan(SPIPlanPtr plan, Datum *Values, const char *Nulls, if (cplan) ReleaseCachedPlan(cplan, true); cplan = NULL; + + /* + * If not read-only mode, advance the command counter after the + * last command. This ensures that its effects are visible, in + * case it was DDL that would affect the next CachedPlanSource. + */ + if (!read_only) + CommandCounterIncrement(); } fail: |