keep relations open until they are no longer needed.

Hiroshi Inoue · Hiroshi Inoue · commit c4bc9a8505ac · 2000-11-21T04:01:09.000Z
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
@@ -6,7 +6,7 @@
  *
  *	1999 Jan Wieck
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.18 2000/11/16 22:30:31 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.19 2000/11/21 04:01:09 inoue Exp $
  *
  * ----------
  */
@@ -247,7 +247,6 @@ RI_FKey_check(PG_FUNCTION_ARGS)
 			qplan = SPI_saveplan(qplan);
 			ri_HashPreparedPlan(&qkey, qplan);
 		}
-		heap_close(pk_rel, NoLock);
 
 		/* ----------
 		 * Execute the plan
@@ -257,6 +256,8 @@ RI_FKey_check(PG_FUNCTION_ARGS)
 			elog(NOTICE, "SPI_connect() failed in RI_FKey_check()");
 
 		SetUserId(RelationGetForm(pk_rel)->relowner);
+		/* pk_rel is no longer neede OK ? */
+		heap_close(pk_rel, NoLock);
 
 		if (SPI_execp(qplan, check_values, check_nulls, 1) != SPI_OK_SELECT)
 			elog(ERROR, "SPI_execp() failed in RI_FKey_check()");
@@ -353,7 +354,6 @@ RI_FKey_check(PG_FUNCTION_ARGS)
 			 */
 			break;
 	}
-	heap_close(pk_rel, NoLock);
 
 	/* ----------
 	 * Note:
@@ -445,6 +445,8 @@ RI_FKey_check(PG_FUNCTION_ARGS)
 	 */
 
 	SetUserId(RelationGetForm(pk_rel)->relowner);
+	/* pk_rel is no longer needed OK ? */
+	heap_close(pk_rel, NoLock);
 
 	if (SPI_execp(qplan, check_values, check_nulls, 1) != SPI_OK_SELECT)
 		elog(ERROR, "SPI_execp() failed in RI_FKey_check()");
@@ -2357,7 +2359,6 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 					 */
 					break;
 			}
-			heap_close(fk_rel, NoLock);
 
 			if (SPI_connect() != SPI_OK_CONNECT)
 				elog(NOTICE, "SPI_connect() failed in RI_FKey_setdefault_del()");
@@ -2461,6 +2462,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 					}
 				}
 			}
+			/* fk_rel is no longer needed OK ? */
+			heap_close(fk_rel, NoLock);
 
 			/* ----------
 			 * We have a plan now. Build up the arguments for SPI_execp()
@@ -2614,7 +2617,6 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
 					 */
 					break;
 			}
-			heap_close(fk_rel, NoLock);
 
 			/* ----------
 			 * No need to do anything if old and new keys are equal
@@ -2743,6 +2745,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
 					}
 				}
 			}
+			/* fk_rel is no longer needed OK ? */
+			heap_close(fk_rel, NoLock);
 
 			/* ----------
 			 * We have a plan now. Build up the arguments for SPI_execp()

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* 1999 Jan Wieck`
`8`	`8`	`*`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.18 2000/11/16 22:30:31 tgl Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ri_triggers.c,v 1.19 2000/11/21 04:01:09 inoue Exp $`
`10`	`10`	`*`
`11`	`11`	`* ----------`
`12`	`12`	`*/`
`@@ -247,7 +247,6 @@ RI_FKey_check(PG_FUNCTION_ARGS)`
`247`	`247`	`qplan = SPI_saveplan(qplan);`
`248`	`248`	`ri_HashPreparedPlan(&qkey, qplan);`
`249`	`249`	`}`
`250`		`- heap_close(pk_rel, NoLock);`
`251`	`250`
`252`	`251`	`/* ----------`
`253`	`252`	`* Execute the plan`
`@@ -257,6 +256,8 @@ RI_FKey_check(PG_FUNCTION_ARGS)`
`257`	`256`	`elog(NOTICE, "SPI_connect() failed in RI_FKey_check()");`
`258`	`257`
`259`	`258`	`SetUserId(RelationGetForm(pk_rel)->relowner);`
	`259`	`+ /* pk_rel is no longer neede OK ? */`
	`260`	`+ heap_close(pk_rel, NoLock);`
`260`	`261`
`261`	`262`	`if (SPI_execp(qplan, check_values, check_nulls, 1) != SPI_OK_SELECT)`
`262`	`263`	`elog(ERROR, "SPI_execp() failed in RI_FKey_check()");`
`@@ -353,7 +354,6 @@ RI_FKey_check(PG_FUNCTION_ARGS)`
`353`	`354`	`*/`
`354`	`355`	`break;`
`355`	`356`	`}`
`356`		`- heap_close(pk_rel, NoLock);`
`357`	`357`
`358`	`358`	`/* ----------`
`359`	`359`	`* Note:`
`@@ -445,6 +445,8 @@ RI_FKey_check(PG_FUNCTION_ARGS)`
`445`	`445`	`*/`
`446`	`446`
`447`	`447`	`SetUserId(RelationGetForm(pk_rel)->relowner);`
	`448`	`+ /* pk_rel is no longer needed OK ? */`
	`449`	`+ heap_close(pk_rel, NoLock);`
`448`	`450`
`449`	`451`	`if (SPI_execp(qplan, check_values, check_nulls, 1) != SPI_OK_SELECT)`
`450`	`452`	`elog(ERROR, "SPI_execp() failed in RI_FKey_check()");`
`@@ -2357,7 +2359,6 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)`
`2357`	`2359`	`*/`
`2358`	`2360`	`break;`
`2359`	`2361`	`}`
`2360`		`- heap_close(fk_rel, NoLock);`
`2361`	`2362`
`2362`	`2363`	`if (SPI_connect() != SPI_OK_CONNECT)`
`2363`	`2364`	`elog(NOTICE, "SPI_connect() failed in RI_FKey_setdefault_del()");`
`@@ -2461,6 +2462,8 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)`
`2461`	`2462`	`}`
`2462`	`2463`	`}`
`2463`	`2464`	`}`
	`2465`	`+ /* fk_rel is no longer needed OK ? */`
	`2466`	`+ heap_close(fk_rel, NoLock);`
`2464`	`2467`
`2465`	`2468`	`/* ----------`
`2466`	`2469`	`* We have a plan now. Build up the arguments for SPI_execp()`
`@@ -2614,7 +2617,6 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)`
`2614`	`2617`	`*/`
`2615`	`2618`	`break;`
`2616`	`2619`	`}`
`2617`		`- heap_close(fk_rel, NoLock);`
`2618`	`2620`
`2619`	`2621`	`/* ----------`
`2620`	`2622`	`* No need to do anything if old and new keys are equal`
`@@ -2743,6 +2745,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)`
`2743`	`2745`	`}`
`2744`	`2746`	`}`
`2745`	`2747`	`}`
	`2748`	`+ /* fk_rel is no longer needed OK ? */`
	`2749`	`+ heap_close(fk_rel, NoLock);`
`2746`	`2750`
`2747`	`2751`	`/* ----------`
`2748`	`2752`	`* We have a plan now. Build up the arguments for SPI_execp()`