NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit229fb58

committed

Treat timeline IDs as unsigned in replication parser

Timeline IDs are unsigned ints everywhere, except the replication parsertreated them as signed ints.

1 parent32f7c0a commit229fb58Copy full SHA for 229fb58

File tree

2 files changed

-9

lines changed

src/backend/replication
- repl_gram.y
- repl_scanner.l

2 files changed

-9

lines changed

`‎src/backend/replication/repl_gram.y‎`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ Node *replication_parse_result;`
`56`	`56`	`%union {`
`57`	`57`	`char*str;`
`58`	`58`	`boolboolval;`
`59`		`-int32intval;`
	`59`	`+uint32uintval;`
`60`	`60`
`61`	`61`	`XLogRecPtrrecptr;`
`62`	`62`	`Node*node;`
`@@ -66,7 +66,7 @@ Node *replication_parse_result;`
`66`	`66`
`67`	`67`	`/* Non-keyword tokens*/`
`68`	`68`	`%token<str>SCONST`
`69`		`-%token<intval>ICONST`
	`69`	`+%token<uintval>UCONST`
`70`	`70`	`%token<recptr>RECPTR`
`71`	`71`
`72`	`72`	`/* Keyword tokens.*/`
`@@ -85,7 +85,7 @@ Node *replication_parse_result;`
`85`	`85`	`%type<node>base_backupstart_replicationidentify_systemtimeline_history`
`86`	`86`	`%type<list>base_backup_opt_list`
`87`	`87`	`%type<defelt>base_backup_opt`
`88`		`-%type<intval>opt_timeline`
	`88`	`+%type<uintval>opt_timeline`
`89`	`89`	`%%`
`90`	`90`
`91`	`91`	`firstcmd:commandopt_semicolon`
`@@ -175,12 +175,12 @@ start_replication:`
`175`	`175`	`;`
`176`	`176`
`177`	`177`	`opt_timeline:`
`178`		`-K_TIMELINEICONST`
	`178`	`+K_TIMELINEUCONST`
`179`	`179`	`{`
`180`	`180`	`if ($2 <=0)`
`181`	`181`	`ereport(ERROR,`
`182`	`182`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`183`		`- (errmsg("invalid timeline %d", $2))));`
	`183`	`+ (errmsg("invalid timeline %u", $2))));`
`184`	`184`	`$$ =$2;`
`185`	`185`	`}`
`186`	`186`	`\|/* nothing*/{$$ =0; }`
`@@ -190,14 +190,14 @@ opt_timeline:`
`190`	`190`	`* TIMELINE_HISTORY %d`
`191`	`191`	`*/`
`192`	`192`	`timeline_history:`
`193`		`-K_TIMELINE_HISTORYICONST`
	`193`	`+K_TIMELINE_HISTORYUCONST`
`194`	`194`	`{`
`195`	`195`	`TimeLineHistoryCmd *cmd;`
`196`	`196`
`197`	`197`	`if ($2 <=0)`
`198`	`198`	`ereport(ERROR,`
`199`	`199`	`(errcode(ERRCODE_SYNTAX_ERROR),`
`200`		`- (errmsg("invalid timeline %d", $2))));`
	`200`	`+ (errmsg("invalid timeline %u", $2))));`
`201`	`201`
`202`	`202`	`cmd = makeNode(TimeLineHistoryCmd);`
`203`	`203`	`cmd->timeline =$2;`

`‎src/backend/replication/repl_scanner.l‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,8 @@ TIMELINE_HISTORY{ return K_TIMELINE_HISTORY; }`
`83`	`83`	`"";`
`84`	`84`
`85`	`85`	`{digit}+{`
`86`		`-yylval.intval =pg_atoi(yytext,sizeof(int32),0);`
`87`		`-returnICONST;`
	`86`	`+yylval.uintval =strtoul(yytext,NULL,10);`
	`87`	`+returnUCONST;`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`{hexdigit}+\/{hexdigit}+{`

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!

Commit229fb58

File tree

2 files changed

2 files changed

`‎src/backend/replication/repl_gram.y‎`

`‎src/backend/replication/repl_scanner.l‎`

0 commit comments