Clean up pg_upgrade cache lookup code; remove useless NULL pointer tests.

bmomjian · bmomjian · commit a52aa6c6db13 · 2010-10-20T20:02:37.000Z
diff --git a/contrib/pg_upgrade/info.c b/contrib/pg_upgrade/info.c
@@ -74,8 +74,8 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
 		num_maps++;
 
 		/*
-		 * so much for the mapping of this relation. Now we need a mapping for
-		 * its corresponding toast relation if any.
+		 * So much for mapping this relation;  now we need a mapping
+		 * for its corresponding toast relation, if any.
 		 */
 		if (oldrel->toastrelid > 0)
 		{
@@ -117,6 +117,7 @@ gen_db_file_maps(DbInfo *old_db, DbInfo *new_db,
 					 newrel->reloid);
 
 			/* look them up in their respective arrays */
+			/* we lose our cache location here */
 			old_toast = relarr_lookup_rel(&old_db->rel_arr,
 										  "pg_toast", old_name, CLUSTER_OLD);
 			new_toast = relarr_lookup_rel(&new_db->rel_arr,
@@ -385,7 +386,7 @@ get_rel_infos(const DbInfo *dbinfo, RelInfoArr *relarr, Cluster whichCluster)
 
 	relarr->rels = relinfos;
 	relarr->nrels = num_rels;
-	relarr->cache_name_rel = 0;
+	relarr->last_relname_lookup = 0;
 }
 
 
@@ -399,9 +400,6 @@ dbarr_lookup_db(DbInfoArr *db_arr, const char *db_name)
 {
 	int			dbnum;
 
-	if (!db_arr || !db_name)
-		return NULL;
-
 	for (dbnum = 0; dbnum < db_arr->ndbs; dbnum++)
 	{
 		if (strcmp(db_arr->dbs[dbnum].db_name, db_name) == 0)
@@ -424,24 +422,21 @@ relarr_lookup_rel(RelInfoArr *rel_arr, const char *nspname,
 {
 	int			relnum;
 
-	if (!rel_arr || !relname)
-		return NULL;
-
 	/* Test next lookup first, for speed */
-	if (rel_arr->cache_name_rel + 1 < rel_arr->nrels &&
-		strcmp(rel_arr->rels[rel_arr->cache_name_rel + 1].nspname, nspname) == 0 &&
-		strcmp(rel_arr->rels[rel_arr->cache_name_rel + 1].relname, relname) == 0)
+	if (rel_arr->last_relname_lookup + 1 < rel_arr->nrels &&
+		strcmp(rel_arr->rels[rel_arr->last_relname_lookup + 1].nspname, nspname) == 0 &&
+		strcmp(rel_arr->rels[rel_arr->last_relname_lookup + 1].relname, relname) == 0)
 	{
-		rel_arr->cache_name_rel++;
-		return &rel_arr->rels[rel_arr->cache_name_rel];
+		rel_arr->last_relname_lookup++;
+		return &rel_arr->rels[rel_arr->last_relname_lookup];
 	}
 
 	for (relnum = 0; relnum < rel_arr->nrels; relnum++)
 	{
 		if (strcmp(rel_arr->rels[relnum].nspname, nspname) == 0 &&
 			strcmp(rel_arr->rels[relnum].relname, relname) == 0)
 		{
-			rel_arr->cache_name_rel = relnum;
+			rel_arr->last_relname_lookup = relnum;
 			return &rel_arr->rels[relnum];
 		}
 	}
@@ -464,9 +459,6 @@ relarr_lookup_reloid(RelInfoArr *rel_arr, Oid oid,
 {
 	int			relnum;
 
-	if (!rel_arr || !oid)
-		return NULL;
-
 	for (relnum = 0; relnum < rel_arr->nrels; relnum++)
 	{
 		if (rel_arr->rels[relnum].reloid == oid)
@@ -483,7 +475,7 @@ relarr_free(RelInfoArr *rel_arr)
 {
 	pg_free(rel_arr->rels);
 	rel_arr->nrels = 0;
-	rel_arr->cache_name_rel = 0;
+	rel_arr->last_relname_lookup = 0;
 }
 
 
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
@@ -78,7 +78,7 @@ typedef struct
 {
 	RelInfo    *rels;
 	int			nrels;
-	int			cache_name_rel;	/* cache of last lookup location */
+	int			last_relname_lookup;	/* cache of last lookup location */
 } RelInfoArr;
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ gen_db_file_maps(DbInfo old_db, DbInfo new_db,`
`74`	`74`	`num_maps++;`
`75`	`75`
`76`	`76`	`/*`
`77`		`- * so much for the mapping of this relation. Now we need a mapping for`
`78`		`- * its corresponding toast relation if any.`
	`77`	`+ * So much for mapping this relation; now we need a mapping`
	`78`	`+ * for its corresponding toast relation, if any.`
`79`	`79`	`*/`
`80`	`80`	`if (oldrel->toastrelid > 0)`
`81`	`81`	`{`
`@@ -117,6 +117,7 @@ gen_db_file_maps(DbInfo old_db, DbInfo new_db,`
`117`	`117`	`newrel->reloid);`
`118`	`118`
`119`	`119`	`/* look them up in their respective arrays */`
	`120`	`+ /* we lose our cache location here */`
`120`	`121`	`old_toast = relarr_lookup_rel(&old_db->rel_arr,`
`121`	`122`	`"pg_toast", old_name, CLUSTER_OLD);`
`122`	`123`	`new_toast = relarr_lookup_rel(&new_db->rel_arr,`
`@@ -385,7 +386,7 @@ get_rel_infos(const DbInfo dbinfo, RelInfoArr relarr, Cluster whichCluster)`
`385`	`386`
`386`	`387`	`relarr->rels = relinfos;`
`387`	`388`	`relarr->nrels = num_rels;`
`388`		`- relarr->cache_name_rel = 0;`
	`389`	`+ relarr->last_relname_lookup = 0;`
`389`	`390`	`}`
`390`	`391`
`391`	`392`
`@@ -399,9 +400,6 @@ dbarr_lookup_db(DbInfoArr db_arr, const char db_name)`
`399`	`400`	`{`
`400`	`401`	`int dbnum;`
`401`	`402`
`402`		`- if (!db_arr \|\| !db_name)`
`403`		`- return NULL;`
`404`		`-`
`405`	`403`	`for (dbnum = 0; dbnum < db_arr->ndbs; dbnum++)`
`406`	`404`	`{`
`407`	`405`	`if (strcmp(db_arr->dbs[dbnum].db_name, db_name) == 0)`
`@@ -424,24 +422,21 @@ relarr_lookup_rel(RelInfoArr rel_arr, const char nspname,`
`424`	`422`	`{`
`425`	`423`	`int relnum;`
`426`	`424`
`427`		`- if (!rel_arr \|\| !relname)`
`428`		`- return NULL;`
`429`		`-`
`430`	`425`	`/* Test next lookup first, for speed */`
`431`		`- if (rel_arr->cache_name_rel + 1 < rel_arr->nrels &&`
`432`		`- strcmp(rel_arr->rels[rel_arr->cache_name_rel + 1].nspname, nspname) == 0 &&`
`433`		`- strcmp(rel_arr->rels[rel_arr->cache_name_rel + 1].relname, relname) == 0)`
	`426`	`+ if (rel_arr->last_relname_lookup + 1 < rel_arr->nrels &&`
	`427`	`+ strcmp(rel_arr->rels[rel_arr->last_relname_lookup + 1].nspname, nspname) == 0 &&`
	`428`	`+ strcmp(rel_arr->rels[rel_arr->last_relname_lookup + 1].relname, relname) == 0)`
`434`	`429`	`{`
`435`		`- rel_arr->cache_name_rel++;`
`436`		`- return &rel_arr->rels[rel_arr->cache_name_rel];`
	`430`	`+ rel_arr->last_relname_lookup++;`
	`431`	`+ return &rel_arr->rels[rel_arr->last_relname_lookup];`
`437`	`432`	`}`
`438`	`433`
`439`	`434`	`for (relnum = 0; relnum < rel_arr->nrels; relnum++)`
`440`	`435`	`{`
`441`	`436`	`if (strcmp(rel_arr->rels[relnum].nspname, nspname) == 0 &&`
`442`	`437`	`strcmp(rel_arr->rels[relnum].relname, relname) == 0)`
`443`	`438`	`{`
`444`		`- rel_arr->cache_name_rel = relnum;`
	`439`	`+ rel_arr->last_relname_lookup = relnum;`
`445`	`440`	`return &rel_arr->rels[relnum];`
`446`	`441`	`}`
`447`	`442`	`}`
`@@ -464,9 +459,6 @@ relarr_lookup_reloid(RelInfoArr *rel_arr, Oid oid,`
`464`	`459`	`{`
`465`	`460`	`int relnum;`
`466`	`461`
`467`		`- if (!rel_arr \|\| !oid)`
`468`		`- return NULL;`
`469`		`-`
`470`	`462`	`for (relnum = 0; relnum < rel_arr->nrels; relnum++)`
`471`	`463`	`{`
`472`	`464`	`if (rel_arr->rels[relnum].reloid == oid)`
`@@ -483,7 +475,7 @@ relarr_free(RelInfoArr *rel_arr)`
`483`	`475`	`{`
`484`	`476`	`pg_free(rel_arr->rels);`
`485`	`477`	`rel_arr->nrels = 0;`
`486`		`- rel_arr->cache_name_rel = 0;`
	`478`	`+ rel_arr->last_relname_lookup = 0;`
`487`	`479`	`}`
`488`	`480`
`489`	`481`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ typedef struct`
`78`	`78`	`{`
`79`	`79`	`RelInfo *rels;`
`80`	`80`	`int nrels;`
`81`		`- int cache_name_rel; /* cache of last lookup location */`
	`81`	`+ int last_relname_lookup; /* cache of last lookup location */`
`82`	`82`	`} RelInfoArr;`
`83`	`83`
`84`	`84`	`/*`