@@ -220,9 +220,16 @@ transfer_relfile(FileNameMap *map, const char *type_suffix, bool vm_must_add_fro
220220char old_file [MAXPGPATH ];
221221char new_file [MAXPGPATH ];
222222int segno ;
223- char extent_suffix [65 ];
223+ char segno_text [65 ];
224+ char const * extent_prefix = "" ;
225+ char const * extent_suffix = "" ;
224226struct stat statbuf ;
225227
228+ if (strcmp (type_suffix ,".cfm" )== 0 )
229+ extent_prefix = segno_text ;
230+ else
231+ extent_suffix = segno_text ;
232+
226233/*
227234 * Now copy/link any related segments as well. Remember, PG breaks large
228235 * files into 1GB segments, the first segment has no extension, subsequent
@@ -231,22 +238,24 @@ transfer_relfile(FileNameMap *map, const char *type_suffix, bool vm_must_add_fro
231238for (segno = 0 ;;segno ++ )
232239{
233240if (segno == 0 )
234- extent_suffix [0 ]= '\0' ;
241+ segno_text [0 ]= '\0' ;
235242else
236- snprintf (extent_suffix ,sizeof (extent_suffix ),".%d" ,segno );
243+ snprintf (segno_text ,sizeof (segno_text ),".%d" ,segno );
237244
238- snprintf (old_file ,sizeof (old_file ),"%s%s/%u/%u%s%s" ,
245+ snprintf (old_file ,sizeof (old_file ),"%s%s/%u/%u%s%s%s " ,
239246map -> old_tablespace ,
240247map -> old_tablespace_suffix ,
241248map -> old_db_oid ,
242249map -> old_relfilenode ,
250+ extent_prefix ,
243251type_suffix ,
244252extent_suffix );
245- snprintf (new_file ,sizeof (new_file ),"%s%s/%u/%u%s%s" ,
253+ snprintf (new_file ,sizeof (new_file ),"%s%s/%u/%u%s%s%s " ,
246254map -> new_tablespace ,
247255map -> new_tablespace_suffix ,
248256map -> new_db_oid ,
249257map -> new_relfilenode ,
258+ extent_prefix ,
250259type_suffix ,
251260extent_suffix );
252261