15
15
static void get_db_infos (ClusterInfo * cluster );
16
16
static void dbarr_print (ClusterInfo * cluster );
17
17
static void relarr_print (RelInfoArr * arr );
18
- static void get_rel_infos (ClusterInfo * cluster , const DbInfo * dbinfo ,
19
- RelInfoArr * relarr );
18
+ static void get_rel_infos (ClusterInfo * cluster , const int dbnum );
20
19
static void relarr_free (RelInfoArr * rel_arr );
21
20
static void map_rel (const RelInfo * oldrel ,
22
21
const RelInfo * newrel , const DbInfo * old_db ,
@@ -272,8 +271,7 @@ get_db_and_rel_infos(ClusterInfo *cluster)
272
271
get_db_infos (cluster );
273
272
274
273
for (dbnum = 0 ; dbnum < cluster -> dbarr .ndbs ; dbnum ++ )
275
- get_rel_infos (cluster , & cluster -> dbarr .dbs [dbnum ],
276
- & cluster -> dbarr .dbs [dbnum ].rel_arr );
274
+ get_rel_infos (cluster , dbnum );
277
275
278
276
if (log_opts .debug )
279
277
dbarr_print (cluster );
@@ -290,9 +288,10 @@ get_db_and_rel_infos(ClusterInfo *cluster)
290
288
* FirstNormalObjectId belongs to the user
291
289
*/
292
290
static void
293
- get_rel_infos (ClusterInfo * cluster , const DbInfo * dbinfo , RelInfoArr * relarr )
291
+ get_rel_infos (ClusterInfo * cluster , const int dbnum )
294
292
{
295
- PGconn * conn = connectToServer (cluster , dbinfo -> db_name );
293
+ PGconn * conn = connectToServer (cluster ,
294
+ cluster -> dbarr .dbs [dbnum ].db_name );
296
295
PGresult * res ;
297
296
RelInfo * relinfos ;
298
297
int ntups ;
@@ -374,16 +373,16 @@ get_rel_infos(ClusterInfo *cluster, const DbInfo *dbinfo, RelInfoArr *relarr)
374
373
tblspace = PQgetvalue (res , relnum , i_spclocation );
375
374
/* if no table tablespace, use the database tablespace */
376
375
if (strlen (tblspace ) == 0 )
377
- tblspace = dbinfo -> db_tblspace ;
376
+ tblspace = cluster -> dbarr . dbs [ dbnum ]. db_tblspace ;
378
377
strlcpy (curr -> tablespace , tblspace , sizeof (curr -> tablespace ));
379
378
}
380
379
PQclear (res );
381
380
382
381
PQfinish (conn );
383
382
384
- relarr -> rels = relinfos ;
385
- relarr -> nrels = num_rels ;
386
- relarr -> last_relname_lookup = 0 ;
383
+ cluster -> dbarr . dbs [ dbnum ]. rel_arr . rels = relinfos ;
384
+ cluster -> dbarr . dbs [ dbnum ]. rel_arr . nrels = num_rels ;
385
+ cluster -> dbarr . dbs [ dbnum ]. rel_arr . last_relname_lookup = 0 ;
387
386
}
388
387
389
388
0 commit comments