postgrespro
diff --git a/‎src/bin/pg_rewind/copy_fetch.c
Lines changed: 9 additions & 5 deletions b/‎src/bin/pg_rewind/copy_fetch.c
Lines changed: 9 additions & 5 deletions
diff --git a/‎src/bin/pg_rewind/file_ops.c
Lines changed: 13 additions & 3 deletions b/‎src/bin/pg_rewind/file_ops.c
Lines changed: 13 additions & 3 deletions
@@ -210,7 +210,7 @@ copy_executeFileMap(filemap_t *map)
 	for (i = 0; i < map->narray; i++)
 	{
 		entry = map->array[i];
-		execute_pagemap(&entry->pagemap, entry->path);
+		execute_pagemap(&entry->target_pages_to_overwrite, entry->path);
 
 		switch (entry->action)
 		{
@@ -219,16 +219,16 @@ copy_executeFileMap(filemap_t *map)
 				break;
 
 			case FILE_ACTION_COPY:
-				rewind_copy_file_range(entry->path, 0, entry->newsize, true);
+				rewind_copy_file_range(entry->path, 0, entry->source_size, true);
 				break;
 
 			case FILE_ACTION_TRUNCATE:
-				truncate_target_file(entry->path, entry->newsize);
+				truncate_target_file(entry->path, entry->source_size);
 				break;
 
 			case FILE_ACTION_COPY_TAIL:
-				rewind_copy_file_range(entry->path, entry->oldsize,
-									   entry->newsize, false);
+				rewind_copy_file_range(entry->path, entry->target_size,
+									   entry->source_size, false);
 				break;
 
 			case FILE_ACTION_CREATE:
@@ -238,6 +238,10 @@ copy_executeFileMap(filemap_t *map)
 			case FILE_ACTION_REMOVE:
 				remove_target(entry);
 				break;
+
+			case FILE_ACTION_UNDECIDED:
+				pg_fatal("no action decided for \"%s\"", entry->path);
+				break;
 		}
 	}
 
 
@@ -126,8 +126,9 @@ void
 remove_target(file_entry_t *entry)
 {
 	Assert(entry->action == FILE_ACTION_REMOVE);
+	Assert(entry->target_exists);
 
-	switch (entry->type)
+	switch (entry->target_type)
 	{
 		case FILE_TYPE_DIRECTORY:
 			remove_target_dir(entry->path);
@@ -140,28 +141,37 @@ remove_target(file_entry_t *entry)
 		case FILE_TYPE_SYMLINK:
 			remove_target_symlink(entry->path);
 			break;
+
+		case FILE_TYPE_UNDEFINED:
+			pg_fatal("undefined file type for \"%s\"", entry->path);
+			break;
 	}
 }
 
 void
 create_target(file_entry_t *entry)
 {
 	Assert(entry->action == FILE_ACTION_CREATE);
+	Assert(!entry->target_exists);
 
-	switch (entry->type)
+	switch (entry->source_type)
 	{
 		case FILE_TYPE_DIRECTORY:
 			create_target_dir(entry->path);
 			break;
 
 		case FILE_TYPE_SYMLINK:
-			create_target_symlink(entry->path, entry->link_target);
+			create_target_symlink(entry->path, entry->source_link_target);
 			break;
 
 		case FILE_TYPE_REGULAR:
 			/* can't happen. Regular files are created with open_target_file. */
 			pg_fatal("invalid action (CREATE) for regular file");
 			break;
+
+		case FILE_TYPE_UNDEFINED:
+			pg_fatal("undefined file type for \"%s\"", entry->path);
+			break;
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,9 @@ void`
`126`	`126`	`remove_target(file_entry_t *entry)`
`127`	`127`	`{`
`128`	`128`	`Assert(entry->action == FILE_ACTION_REMOVE);`
	`129`	`+ Assert(entry->target_exists);`
`129`	`130`
`130`		`- switch (entry->type)`
	`131`	`+ switch (entry->target_type)`
`131`	`132`	`{`
`132`	`133`	`case FILE_TYPE_DIRECTORY:`
`133`	`134`	`remove_target_dir(entry->path);`
`@@ -140,28 +141,37 @@ remove_target(file_entry_t *entry)`
`140`	`141`	`case FILE_TYPE_SYMLINK:`
`141`	`142`	`remove_target_symlink(entry->path);`
`142`	`143`	`break;`
	`144`	`+`
	`145`	`+ case FILE_TYPE_UNDEFINED:`
	`146`	`+ pg_fatal("undefined file type for \"%s\"", entry->path);`
	`147`	`+ break;`
`143`	`148`	`}`
`144`	`149`	`}`
`145`	`150`
`146`	`151`	`void`
`147`	`152`	`create_target(file_entry_t *entry)`
`148`	`153`	`{`
`149`	`154`	`Assert(entry->action == FILE_ACTION_CREATE);`
	`155`	`+ Assert(!entry->target_exists);`
`150`	`156`
`151`		`- switch (entry->type)`
	`157`	`+ switch (entry->source_type)`
`152`	`158`	`{`
`153`	`159`	`case FILE_TYPE_DIRECTORY:`
`154`	`160`	`create_target_dir(entry->path);`
`155`	`161`	`break;`
`156`	`162`
`157`	`163`	`case FILE_TYPE_SYMLINK:`
`158`		`- create_target_symlink(entry->path, entry->link_target);`
	`164`	`+ create_target_symlink(entry->path, entry->source_link_target);`
`159`	`165`	`break;`
`160`	`166`
`161`	`167`	`case FILE_TYPE_REGULAR:`
`162`	`168`	`/* can't happen. Regular files are created with open_target_file. */`
`163`	`169`	`pg_fatal("invalid action (CREATE) for regular file");`
`164`	`170`	`break;`
	`171`	`+`
	`172`	`+ case FILE_TYPE_UNDEFINED:`
	`173`	`+ pg_fatal("undefined file type for \"%s\"", entry->path);`
	`174`	`+ break;`
`165`	`175`	`}`
`166`	`176`	`}`
`167`	`177`