Commit96b42de

committed

exec_eval_simple_expr() needs to do CommandCounterIncrement() not just

GetTransactionSnapshot() to ensure ActiveSnapshot advances properly.Sigh. Extend regression test so it reveals this error too.

1 parentc21c658 commit96b42deCopy full SHA for 96b42de

File tree

+20

-2

lines changed

+20

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* procedural language`
`4`	`4`	`*`
`5`	`5`	`* IDENTIFICATION`
`6`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.125 2004/12/19 20:20:17 tgl Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.126 2004/12/21 18:33:35 tgl Exp $`
`7`	`7`	`*`
`8`	`8`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`9`	`9`	`*`
`@@ -3631,7 +3631,7 @@ exec_eval_simple_expr(PLpgSQL_execstate *estate,`
`3631`	`3631`
`3632`	`3632`	`/*`
`3633`	`3633`	`* We have to do some of the things SPI_execute_plan would do,`
`3634`		`- * in particularadjust ActiveSnapshot if we are in a non-read-only`
	`3634`	`+ * in particularadvance the snapshot if we are in a non-read-only`
`3635`	`3635`	`* function. Without this, stable functions within the expression`
`3636`	`3636`	`* would fail to see updates made so far by our own function.`
`3637`	`3637`	`*/`
`@@ -3644,7 +3644,11 @@ exec_eval_simple_expr(PLpgSQL_execstate *estate,`
`3644`	`3644`
`3645`	`3645`	`oldcontext=MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);`
`3646`	`3646`	`if (!estate->readonly_func)`
	`3647`	`+{`
	`3648`	`+CommandCounterIncrement();`
`3647`	`3649`	`ActiveSnapshot=CopySnapshot(GetTransactionSnapshot());`
	`3650`	`+}`
	`3651`	`+`
`3648`	`3652`	`/*`
`3649`	`3653`	`* Finally we can call the executor to evaluate the expression`
`3650`	`3654`	`*/`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2089,5 +2089,17 @@ select sp_add_user('user2');`
`2089`	`2089`	`-1`
`2090`	`2090`	`(1 row)`
`2091`	`2091`
	`2092`	`+select sp_add_user('user3');`
	`2093`	`+ sp_add_user`
	`2094`	`+-------------`
	`2095`	`+ 3`
	`2096`	`+(1 row)`
	`2097`	`+`
	`2098`	`+select sp_add_user('user3');`
	`2099`	`+ sp_add_user`
	`2100`	`+-------------`
	`2101`	`+ -1`
	`2102`	`+(1 row)`
	`2103`	`+`
`2092`	`2104`	`drop function sp_add_user(text);`
`2093`	`2105`	`drop function sp_id_user(text);`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1802,6 +1802,8 @@ end$$ language plpgsql;`
`1802`	`1802`	`select sp_add_user('user1');`
`1803`	`1803`	`select sp_add_user('user2');`
`1804`	`1804`	`select sp_add_user('user2');`
	`1805`	`+select sp_add_user('user3');`
	`1806`	`+select sp_add_user('user3');`
`1805`	`1807`
`1806`	`1808`	`dropfunction sp_add_user(text);`
`1807`	`1809`	`dropfunction sp_id_user(text);`

Comments

(0)