Skip to content

Commit f81e97d

Browse files
committed
pg_rewind: Replace the hybrid list+array data structure with simplehash.
Now that simplehash can be used in frontend code, let's make use of it. Reviewed-by: Kyotaro Horiguchi, Soumyadeep Chakraborty Discussion: https://www.postgresql.org/message-id/0c5b3783-af52-3ee5-f8fa-6e794061f70d%40iki.fi
1 parent eb00f1d commit f81e97d

File tree

7 files changed

+176
-211
lines changed

7 files changed

+176
-211
lines changed

src/bin/pg_rewind/copy_fetch.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ copy_executeFileMap(filemap_t *map)
207207
file_entry_t *entry;
208208
int i;
209209

210-
for (i = 0; i < map->narray; i++)
210+
for (i = 0; i < map->nentries; i++)
211211
{
212-
entry = map->array[i];
212+
entry = map->entries[i];
213213
execute_pagemap(&entry->target_pages_to_overwrite, entry->path);
214214

215215
switch (entry->action)

src/bin/pg_rewind/fetch.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ fetchSourceFileList(void)
3737
* Fetch all relation data files that are marked in the given data page map.
3838
*/
3939
void
40-
executeFileMap(void)
40+
execute_file_actions(filemap_t *filemap)
4141
{
4242
if (datadir_source)
4343
copy_executeFileMap(filemap);

src/bin/pg_rewind/fetch.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
extern void fetchSourceFileList(void);
2727
extern char *fetchFile(const char *filename, size_t *filesize);
28-
extern void executeFileMap(void);
28+
extern void execute_file_actions(filemap_t *filemap);
2929

3030
/* in libpq_fetch.c */
3131
extern void libpqProcessFileList(void);

0 commit comments

Comments
 (0)