The session_replication_role actually can be changed at will during

Jan Wieck · Jan Wieck · commit 1120b99445a9 · 2007-06-05T20:00:41.000Z
a session regardless of the existence of cached plans. The plancache
only needs to be invalidated so that rules affected by the new setting
will be reflected in the new query plans.

Jan
diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c
@@ -33,7 +33,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/plancache.c,v 1.9 2007/05/14 18:13:21 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/plancache.c,v 1.10 2007/06/05 20:00:41 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -944,14 +944,3 @@ InvalRelid(Oid relid, LOCKMODE lockmode, InvalRelidContext *context)
 	if (relid == context->inval_relid || context->inval_relid == InvalidOid)
 		context->plan->dead = true;
 }
-
-
-/*
- * HaveCachedPlans 
- *		Check if the plancache has stored any plans at all.
- */
-bool
-HaveCachedPlans(void)
-{
-	return (cached_plans_list != NIL);
-}
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -10,7 +10,7 @@
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.393 2007/06/03 17:07:34 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.394 2007/06/05 20:00:41 wieck Exp $
  *
  *--------------------------------------------------------------------
  */
@@ -6270,24 +6270,29 @@ assign_defaultxactisolevel(const char *newval, bool doit, GucSource source)
 static const char *
 assign_session_replication_role(const char *newval, bool doit, GucSource source)
 {
-	if (HaveCachedPlans())
-		elog(ERROR, "session_replication_role cannot be changed "
-					"after prepared plans have been cached");
-
 	if (pg_strcasecmp(newval, "origin") == 0)
 	{
 		if (doit)
+		{
+			ResetPlanCache();
 			SessionReplicationRole = SESSION_REPLICATION_ROLE_ORIGIN;
+		}
 	}
 	else if (pg_strcasecmp(newval, "replica") == 0)
 	{
 		if (doit)
+		{
+			ResetPlanCache();
 			SessionReplicationRole = SESSION_REPLICATION_ROLE_REPLICA;
+		}
 	}
 	else if (pg_strcasecmp(newval, "local") == 0)
 	{
 		if (doit)
+		{
+			ResetPlanCache();
 			SessionReplicationRole = SESSION_REPLICATION_ROLE_LOCAL;
+		}
 	}
 	else
 		return NULL;
diff --git a/src/include/utils/plancache.h b/src/include/utils/plancache.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/utils/plancache.h,v 1.6 2007/04/16 18:21:07 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/utils/plancache.h,v 1.7 2007/06/05 20:00:41 wieck Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -106,7 +106,6 @@ extern CachedPlan *RevalidateCachedPlan(CachedPlanSource *plansource,
 										bool useResOwner);
 extern void ReleaseCachedPlan(CachedPlan *plan, bool useResOwner);
 extern TupleDesc PlanCacheComputeResultDesc(List *stmt_list);
-extern bool HaveCachedPlans(void);
 
 extern void ResetPlanCache(void);
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.393 2007/06/03 17:07:34 tgl Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.394 2007/06/05 20:00:41 wieck Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -6270,24 +6270,29 @@ assign_defaultxactisolevel(const char *newval, bool doit, GucSource source)`
`6270`	`6270`	`static const char *`
`6271`	`6271`	`assign_session_replication_role(const char *newval, bool doit, GucSource source)`
`6272`	`6272`	`{`
`6273`		`- if (HaveCachedPlans())`
`6274`		`- elog(ERROR, "session_replication_role cannot be changed "`
`6275`		`- "after prepared plans have been cached");`
`6276`		`-`
`6277`	`6273`	`if (pg_strcasecmp(newval, "origin") == 0)`
`6278`	`6274`	`{`
`6279`	`6275`	`if (doit)`
	`6276`	`+ {`
	`6277`	`+ ResetPlanCache();`
`6280`	`6278`	`SessionReplicationRole = SESSION_REPLICATION_ROLE_ORIGIN;`
	`6279`	`+ }`
`6281`	`6280`	`}`
`6282`	`6281`	`else if (pg_strcasecmp(newval, "replica") == 0)`
`6283`	`6282`	`{`
`6284`	`6283`	`if (doit)`
	`6284`	`+ {`
	`6285`	`+ ResetPlanCache();`
`6285`	`6286`	`SessionReplicationRole = SESSION_REPLICATION_ROLE_REPLICA;`
	`6287`	`+ }`
`6286`	`6288`	`}`
`6287`	`6289`	`else if (pg_strcasecmp(newval, "local") == 0)`
`6288`	`6290`	`{`
`6289`	`6291`	`if (doit)`
	`6292`	`+ {`
	`6293`	`+ ResetPlanCache();`
`6290`	`6294`	`SessionReplicationRole = SESSION_REPLICATION_ROLE_LOCAL;`
	`6295`	`+ }`
`6291`	`6296`	`}`
`6292`	`6297`	`else`
`6293`	`6298`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`9`	`9`	`* Portions Copyright (c) 1994, Regents of the University of California`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/src/include/utils/plancache.h,v 1.6 2007/04/16 18:21:07 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/include/utils/plancache.h,v 1.7 2007/06/05 20:00:41 wieck Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -106,7 +106,6 @@ extern CachedPlan RevalidateCachedPlan(CachedPlanSource plansource,`
`106`	`106`	`bool useResOwner);`
`107`	`107`	`extern void ReleaseCachedPlan(CachedPlan *plan, bool useResOwner);`
`108`	`108`	`extern TupleDesc PlanCacheComputeResultDesc(List *stmt_list);`
`109`		`-extern bool HaveCachedPlans(void);`
`110`	`109`
`111`	`110`	`extern void ResetPlanCache(void);`
`112`	`111`