NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit4c8044c

committed

pg_waldump: Allow hexadecimal values for -t/--timeline option

This makes it easier to specify values taken directly from WAL filenames.The option parsing is arranged in the style of option_parse_int() (butwe need to parse unsigned int), to allow future refactoring in thesame manner.Reviewed-by: Sébastien Lardière <sebastien@lardiere.net>Discussion:https://www.postgresql.org/message-id/flat/8fef346e-2541-76c3-d768-6536ae052993@lardiere.net

1 parentb797def commit4c8044cCopy full SHA for 4c8044c

File tree

2 files changed

+35

-5

lines changed

doc/src/sgml/ref
- pg_waldump.sgml
src/bin/pg_waldump
- pg_waldump.c

2 files changed

+35

-5

lines changed

`‎doc/src/sgml/ref/pg_waldump.sgml`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,8 @@ PostgreSQL documentation`
`215`	`215`	`<para>`
`216`	`216`	`Timeline from which to read WAL records. The default is to use the`
`217`	`217`	`value in <replaceable>startseg</replaceable>, if that is specified; otherwise, the`
`218`		`- default is 1.`
	`218`	`+ default is 1. The value can be specified in decimal or hexadecimal,`
	`219`	`+ for example <literal>17</literal> or <literal>0x11</literal>.`
`219`	`220`	`</para>`
`220`	`221`	`</listitem>`
`221`	`222`	`</varlistentry>`

`‎src/bin/pg_waldump/pg_waldump.c`

Lines changed: 33 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`#include"postgres.h"`
`14`	`14`
`15`	`15`	`#include<dirent.h>`
	`16`	`+#include<limits.h>`
`16`	`17`	`#include<signal.h>`
`17`	`18`	`#include<sys/stat.h>`
`18`	`19`	`#include<unistd.h>`
`@@ -1007,12 +1008,40 @@ main(int argc, char **argv)`
`1007`	`1008`	`private.startptr= (uint64)xlogid <<32 \|xrecoff;`
`1008`	`1009`	`break;`
`1009`	`1010`	`case't':`
`1010`		`-if (sscanf(optarg,"%u",&private.timeline)!=1)`
	`1011`	`+`
	`1012`	`+/*`
	`1013`	`+ * This is like option_parse_int() but needs to handle`
	`1014`	`+ * unsigned 32-bit int. Also, we accept both decimal and`
	`1015`	`+ * hexadecimal specifications here.`
	`1016`	`+ */`
`1011`	`1017`	`{`
`1012`		`-pg_log_error("invalid timeline specification: \"%s\"",optarg);`
`1013`		`-gotobad_argument;`
	`1018`	`+char*endptr;`
	`1019`	`+unsigned longval;`
	`1020`	`+`
	`1021`	`+errno=0;`
	`1022`	`+val=strtoul(optarg,&endptr,0);`
	`1023`	`+`
	`1024`	`+while (endptr!='\0'&&isspace((unsignedchar)endptr))`
	`1025`	`+endptr++;`
	`1026`	`+`
	`1027`	`+if (*endptr!='\0')`
	`1028`	`+{`
	`1029`	`+pg_log_error("invalid value \"%s\" for option %s",`
	`1030`	`+optarg,"-t/--timeline");`
	`1031`	`+gotobad_argument;`
	`1032`	`+}`
	`1033`	`+`
	`1034`	`+if (errno==ERANGE\|\|val<1\|\|val>UINT_MAX)`
	`1035`	`+{`
	`1036`	`+pg_log_error("%s must be in range %u..%u",`
	`1037`	`+"-t/--timeline",1,UINT_MAX);`
	`1038`	`+gotobad_argument;`
	`1039`	`+}`
	`1040`	`+`
	`1041`	`+private.timeline=val;`
	`1042`	`+`
	`1043`	`+break;`
`1014`	`1044`	`}`
`1015`		`-break;`
`1016`	`1045`	`case'w':`
`1017`	`1046`	`config.filter_by_fpw= true;`
`1018`	`1047`	`break;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4c8044c

File tree

2 files changed

2 files changed

`‎doc/src/sgml/ref/pg_waldump.sgml`

`‎src/bin/pg_waldump/pg_waldump.c`

0 commit comments