Commit807005c

committed

Use macro atooid() for conversion of strings to oids, per suggestion

from Tom.

1 parent5ac144d commit807005cCopy full SHA for 807005c

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ get_db_infos(migratorContext ctx, DbInfoArr dbinfs_arr, Cluster whichCluster)`
`242`	`242`
`243`	`243`	`for (tupnum=0;tupnum<ntups;tupnum++)`
`244`	`244`	`{`
`245`		`-dbinfos[tupnum].db_oid=str2uint(PQgetvalue(res,tupnum,i_oid));`
	`245`	`+dbinfos[tupnum].db_oid=atooid(PQgetvalue(res,tupnum,i_oid));`
`246`	`246`
`247`	`247`	`snprintf(dbinfos[tupnum].db_name,sizeof(dbinfos[tupnum].db_name),"%s",`
`248`	`248`	`PQgetvalue(res,tupnum,i_datname));`
`@@ -360,16 +360,16 @@ get_rel_infos(migratorContext ctx, const DbInfo dbinfo,`
`360`	`360`	`RelInfo*curr=&relinfos[num_rels++];`
`361`	`361`	`constchar*tblspace;`
`362`	`362`
`363`		`-curr->reloid=str2uint(PQgetvalue(res,relnum,i_oid));`
	`363`	`+curr->reloid=atooid(PQgetvalue(res,relnum,i_oid));`
`364`	`364`
`365`	`365`	`nspname=PQgetvalue(res,relnum,i_nspname);`
`366`	`366`	`strlcpy(curr->nspname,nspname,sizeof(curr->nspname));`
`367`	`367`
`368`	`368`	`relname=PQgetvalue(res,relnum,i_relname);`
`369`	`369`	`strlcpy(curr->relname,relname,sizeof(curr->relname));`
`370`	`370`
`371`		`-curr->relfilenode=str2uint(PQgetvalue(res,relnum,i_relfilenode));`
`372`		`-curr->toastrelid=str2uint(PQgetvalue(res,relnum,i_reltoastrelid));`
	`371`	`+curr->relfilenode=atooid(PQgetvalue(res,relnum,i_relfilenode));`
	`372`	`+curr->toastrelid=atooid(PQgetvalue(res,relnum,i_reltoastrelid));`
`373`	`373`
`374`	`374`	`tblspace=PQgetvalue(res,relnum,i_spclocation);`
`375`	`375`	`/* if no table tablespace, use the database tablespace */`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,8 @@`
`52`	`52`
`53`	`53`	`#defineCLUSTERNAME(cluster)((cluster) == CLUSTER_OLD ? "old" : "new")`
`54`	`54`
	`55`	`+#defineatooid(x) ((Oid) strtoul((x), NULL, 10))`
	`56`	`+`
`55`	`57`	`/* OID system catalog preservation added during PG 9.0 development */`
`56`	`58`	`#defineTABLE_SPACE_SUBDIRS 201001111`
`57`	`59`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,9 @@ get_pg_database_relfilenode(migratorContext *ctx, Cluster whichCluster)`
`94`	`94`
`95`	`95`	`i_relfile=PQfnumber(res,"relfilenode");`
`96`	`96`	`if (whichCluster==CLUSTER_OLD)`
`97`		`-ctx->old.pg_database_oid=str2uint(PQgetvalue(res,0,i_relfile));`
	`97`	`+ctx->old.pg_database_oid=atooid(PQgetvalue(res,0,i_relfile));`
`98`	`98`	`else`
`99`		`-ctx->new.pg_database_oid=str2uint(PQgetvalue(res,0,i_relfile));`
	`99`	`+ctx->new.pg_database_oid=atooid(PQgetvalue(res,0,i_relfile));`
`100`	`100`
`101`	`101`	`PQclear(res);`
`102`	`102`	`PQfinish(conn);`

Comments

(0)