Put a CHECK_FOR_INTERRUPTS call into the loops that try to find a unique new

tglsfdc · tglsfdc · commit 5ce6829b73b2 · 2008-02-20T17:44:09.000Z
OID or new relfilenode.  If the existing OIDs are sufficiently densely
populated, this could take a long time (perhaps even be an infinite loop),
so it seems wise to allow the system to respond to a cancel interrupt here.
Per a gripe from Jacky Leng.

Backpatch as far as 8.1.  Older versions just fail on OID collision,
instead of looping.
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.72 2008/01/01 19:45:48 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.73 2008/02/20 17:44:09 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -374,6 +374,8 @@ GetNewOidWithIndex(Relation relation, Relation indexrel)
 	/* Generate new OIDs until we find one not in the table */
 	do
 	{
+		CHECK_FOR_INTERRUPTS();
+
 		newOid = GetNewObjectId();
 
 		ScanKeyInit(&key,
@@ -423,6 +425,8 @@ GetNewRelFileNode(Oid reltablespace, bool relisshared, Relation pg_class)
 
 	do
 	{
+		CHECK_FOR_INTERRUPTS();
+
 		/* Generate the OID */
 		if (pg_class)
 			rnode.relNode = GetNewOid(pg_class);

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.72 2008/01/01 19:45:48 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/catalog/catalog.c,v 1.73 2008/02/20 17:44:09 tgl Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -374,6 +374,8 @@ GetNewOidWithIndex(Relation relation, Relation indexrel)`
`374`	`374`	`/* Generate new OIDs until we find one not in the table */`
`375`	`375`	`do`
`376`	`376`	`{`
	`377`	`+ CHECK_FOR_INTERRUPTS();`
	`378`	`+`
`377`	`379`	`newOid = GetNewObjectId();`
`378`	`380`
`379`	`381`	`ScanKeyInit(&key,`
`@@ -423,6 +425,8 @@ GetNewRelFileNode(Oid reltablespace, bool relisshared, Relation pg_class)`
`423`	`425`
`424`	`426`	`do`
`425`	`427`	`{`
	`428`	`+ CHECK_FOR_INTERRUPTS();`
	`429`	`+`
`426`	`430`	`/* Generate the OID */`
`427`	`431`	`if (pg_class)`
`428`	`432`	`rnode.relNode = GetNewOid(pg_class);`