Silence compiler warning on an unused variable

alvherre · alvherre · commit 0aeb5ae20415 · 2013-07-22T13:15:13.000-04:00
Also, tweak wording in comments (per Andres) and documentation (myself)
to point out that it's the database's default tablespace that can be
passed as 0, not DEFAULTTABLESPACE_OID.  Robert Haas noticed the bug in
the code, but didn't update the accompanying prose.
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
@@ -15814,8 +15814,8 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
    <para>
     <function>pg_filenode_relation</> is the reverse of
     <function>pg_relation_filenode</>. Given a <quote>tablespace</> OID and
-    a <quote>filenode</> it returns the associated relation. The default
-    tablespace can be specified as 0.
+	a <quote>filenode</>, it returns the associated relation's OID. For a table
+    in the database's default tablespace, the tablespace can be specified as 0.
    </para>
 
   </sect2>
diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c
@@ -760,13 +760,14 @@ pg_relation_filenode(PG_FUNCTION_ARGS)
  * Get the relation via (reltablespace, relfilenode)
  *
  * This is expected to be used when somebody wants to match an individual file
- * on the filesystem back to its table. Thats not trivially possible via
- * pg_class because that doesn't contain the relfilenodes of shared and nailed
+ * on the filesystem back to its table. That's not trivially possible via
+ * pg_class, because that doesn't contain the relfilenodes of shared and nailed
  * tables.
  *
  * We don't fail but return NULL if we cannot find a mapping.
  *
- * Instead of knowing DEFAULTTABLESPACE_OID you can pass 0.
+ * InvalidOid can be passed instead of the current database's default
+ * tablespace.
  */
 Datum
 pg_filenode_relation(PG_FUNCTION_ARGS)
diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
@@ -210,7 +210,7 @@ RelidByRelfilenode(Oid reltablespace, Oid relfilenode)
 
 	while (HeapTupleIsValid(ntp = systable_getnext(scandesc)))
 	{
-		bool isnull;
+		bool isnull PG_USED_FOR_ASSERTS_ONLY;
 
 		if (found)
 			elog(ERROR,

Original file line number	Diff line number	Diff line change
`@@ -760,13 +760,14 @@ pg_relation_filenode(PG_FUNCTION_ARGS)`
`760`	`760`	`* Get the relation via (reltablespace, relfilenode)`
`761`	`761`	`*`
`762`	`762`	`* This is expected to be used when somebody wants to match an individual file`
`763`		`- * on the filesystem back to its table. Thats not trivially possible via`
`764`		`- * pg_class because that doesn't contain the relfilenodes of shared and nailed`
	`763`	`+ * on the filesystem back to its table. That's not trivially possible via`
	`764`	`+ * pg_class, because that doesn't contain the relfilenodes of shared and nailed`
`765`	`765`	`* tables.`
`766`	`766`	`*`
`767`	`767`	`* We don't fail but return NULL if we cannot find a mapping.`
`768`	`768`	`*`
`769`		`- * Instead of knowing DEFAULTTABLESPACE_OID you can pass 0.`
	`769`	`+ * InvalidOid can be passed instead of the current database's default`
	`770`	`+ * tablespace.`
`770`	`771`	`*/`
`771`	`772`	`Datum`
`772`	`773`	`pg_filenode_relation(PG_FUNCTION_ARGS)`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ RelidByRelfilenode(Oid reltablespace, Oid relfilenode)`
`210`	`210`
`211`	`211`	`while (HeapTupleIsValid(ntp = systable_getnext(scandesc)))`
`212`	`212`	`{`
`213`		`- bool isnull;`
	`213`	`+ bool isnull PG_USED_FOR_ASSERTS_ONLY;`
`214`	`214`
`215`	`215`	`if (found)`
`216`	`216`	`elog(ERROR,`