Fix compile warnings from truncate patch.

tglsfdc · tglsfdc · commit 4c61c827d3d7 · 2002-11-23T18:26:45.000Z
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.96 2002/11/23 04:05:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.97 2002/11/23 18:26:45 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -184,7 +184,7 @@ rebuild_rel(Oid tableOid, Oid indexOid, List *indexes, bool dataCopy)
 	 * If dataCopy is true, we assume that we will be basing the
 	 * copy off an index for cluster operations.
 	 */
-	Assert(!dataCopy || indexOid != NULL);
+	Assert(!dataCopy || OidIsValid(indexOid));
 	/*
 	 * Create the new heap, using a temporary name in the same namespace
 	 * as the existing table.  NOTE: there is some risk of collision with
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.56 2002/11/23 04:05:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.57 2002/11/23 18:26:45 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -449,7 +449,7 @@ TruncateRelation(const RangeVar *relation)
 	 * Do the real work using the same technique as cluster, but
 	 * without the code copy portion
 	 */
-	rebuild_rel(relid, NULL, indexes, false);
+	rebuild_rel(relid, InvalidOid, indexes, false);
 }
 
 /*----------

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.96 2002/11/23 04:05:51 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/cluster.c,v 1.97 2002/11/23 18:26:45 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`*-------------------------------------------------------------------------`
`17`	`17`	`*/`
`@@ -184,7 +184,7 @@ rebuild_rel(Oid tableOid, Oid indexOid, List *indexes, bool dataCopy)`
`184`	`184`	`* If dataCopy is true, we assume that we will be basing the`
`185`	`185`	`* copy off an index for cluster operations.`
`186`	`186`	`*/`
`187`		`- Assert(!dataCopy \|\| indexOid != NULL);`
	`187`	`+ Assert(!dataCopy \|\| OidIsValid(indexOid));`
`188`	`188`	`/*`
`189`	`189`	`* Create the new heap, using a temporary name in the same namespace`
`190`	`190`	`* as the existing table. NOTE: there is some risk of collision with`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.56 2002/11/23 04:05:51 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/tablecmds.c,v 1.57 2002/11/23 18:26:45 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -449,7 +449,7 @@ TruncateRelation(const RangeVar *relation)`
`449`	`449`	`* Do the real work using the same technique as cluster, but`
`450`	`450`	`* without the code copy portion`
`451`	`451`	`*/`
`452`		`- rebuild_rel(relid, NULL, indexes, false);`
	`452`	`+ rebuild_rel(relid, InvalidOid, indexes, false);`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`/*----------`