Commitcad3ede

committed

pg_rewind: Improve internationalization

This is mostly cosmetic since two of the three changes are debugmessages, and the third one is just a progress indicator.Author: Michaël Paquier

1 parent37732a2 commitcad3edeCopy full SHA for cad3ede

File tree

+14

-7

lines changed

+14

-7

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`#include"postgres_fe.h"`
`14`	`14`
`15`	`15`	`#include"datapagemap.h"`
	`16`	`+#include"logging.h"`
`16`	`17`
`17`	`18`	`structdatapagemap_iterator`
`18`	`19`	`{`
`@@ -120,7 +121,7 @@ datapagemap_print(datapagemap_t *map)`
`120`	`121`
`121`	`122`	`iter=datapagemap_iterate(map);`
`122`	`123`	`while (datapagemap_next(iter,&blocknum))`
`123`		`-printf("blk %u\n",blocknum);`
	`124`	`+pg_log(PG_DEBUG,"block %u\n",blocknum);`
`124`	`125`
`125`	`126`	`pg_free(iter);`
`126`	`127`	`}`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,11 @@ print_filemap(void)`
`531`	`531`	`if (entry->action!=FILE_ACTION_NONE\|\|`
`532`	`532`	`entry->pagemap.bitmapsize>0)`
`533`	`533`	`{`
`534`		`-printf("%s (%s)\n",entry->path,action_to_str(entry->action));`
	`534`	`+pg_log(PG_DEBUG,`
	`535`	`+/*------`
	`536`	`+ translator: first %s is a file path, second is a keyword such as COPY */`
	`537`	`+"%s (%s)\n",entry->path,`
	`538`	`+action_to_str(entry->action));`
`535`	`539`
`536`	`540`	`if (entry->pagemap.bitmapsize>0)`
`537`	`541`	`datapagemap_print(&entry->pagemap);`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -470,9 +470,9 @@ getTimelineHistory(ControlFileData controlFile, int nentries)`
`470`	`470`	`inti;`
`471`	`471`
`472`	`472`	`if (controlFile==&ControlFile_source)`
`473`		`-printf("Source timeline history:\n");`
	`473`	`+pg_log(PG_DEBUG,"Source timeline history:\n");`
`474`	`474`	`elseif (controlFile==&ControlFile_target)`
`475`		`-printf("Target timeline history:\n");`
	`475`	`+pg_log(PG_DEBUG,"Target timeline history:\n");`
`476`	`476`	`else`
`477`	`477`	`Assert(false);`
`478`	`478`
`@@ -484,9 +484,11 @@ getTimelineHistory(ControlFileData controlFile, int nentries)`
`484`	`484`	`TimeLineHistoryEntry*entry;`
`485`	`485`
`486`	`486`	`entry=&history[i];`
`487`		`-printf("%d: %X/%X - %X/%X\n",entry->tli,`
`488`		`-(uint32) (entry->begin >>32), (uint32) (entry->begin),`
`489`		`-(uint32) (entry->end >>32), (uint32) (entry->end));`
	`487`	`+pg_log(PG_DEBUG,`
	`488`	`+/* translator: %d is a timeline number, others are LSN positions */`
	`489`	`+"%d: %X/%X - %X/%X\n",entry->tli,`
	`490`	`+ (uint32) (entry->begin >>32), (uint32) (entry->begin),`
	`491`	`+ (uint32) (entry->end >>32), (uint32) (entry->end));`
`490`	`492`	`}`
`491`	`493`	`}`
`492`	`494`

Comments

(0)