NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9cd28c2

committed

Remove server support for old BASE_BACKUP command syntax.

Commit0ba281c added a new syntaxfor the BASE_BACKUP command, with extensible options, but maintainedsupport for the legacy syntax. This isn't important for PostgreSQL,where pg_basebackup works with older server versions but not newerones, but it could in theory matter for out-of-core users of thereplication protocol.Discussion on pgsql-hackers, however, suggests that no one is awareof any out-of-core use of the BASE_BACKUP command, and the consensusis in favor of removing support for the old syntax to simplify thecode, so do that.Discussion:http://postgr.es/m/CA+TgmoazKcKUWtqVa0xZqSzbKgTH+X-aw4V7GyLD68EpDLMh8A@mail.gmail.com

1 parent6d503d2 commit9cd28c2Copy full SHA for 9cd28c2

File tree

3 files changed

-114

lines changed

doc/src/sgml
- protocol.sgml
src/backend/replication
- repl_gram.y
- repl_scanner.l

3 files changed

-114

lines changed

`‎doc/src/sgml/protocol.sgml`

Lines changed: 0 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -3041,17 +3041,6 @@ The commands accepted in replication mode are:`
`3041`	`3041`	`</para>`
`3042`	`3042`	`</listitem>`
`3043`	`3043`	`</varlistentry>`
`3044`		`-`
`3045`		`- <varlistentry>`
`3046`		- <term><literal>BASE_BACKUP</literal> [ <literal>LABEL</literal> <replaceable>'label'</replaceable> ] [ <literal>PROGRESS</literal> ] [ <literal>FAST</literal> ] [ <literal>WAL</literal> ] [ <literal>NOWAIT</literal> ] [ <literal>MAX_RATE</literal> <replaceable>rate</replaceable> ] [ <literal>TABLESPACE_MAP</literal> ] [ <literal>NOVERIFY_CHECKSUMS</literal> ] [ <literal>MANIFEST</literal> <replaceable>manifest_option</replaceable> ] [ <literal>MANIFEST_CHECKSUMS</literal> <replaceable>checksum_algorithm</replaceable> ]
`3047`		`- </term>`
`3048`		`- <listitem>`
`3049`		`- <para>`
`3050`		`- For compatibility with older releases, this alternative syntax for`
`3051`		`- the <literal>BASE_BACKUP</literal> command is still supported.`
`3052`		`- </para>`
`3053`		`- </listitem>`
`3054`		`- </varlistentry>`
`3055`	`3044`	`</variablelist>`
`3056`	`3045`
`3057`	`3046`	`</para>`

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

Lines changed: 4 additions & 93 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,15 +67,7 @@ Node *replication_parse_result;`
`67`	`67`	`%tokenK_CREATE_REPLICATION_SLOT`
`68`	`68`	`%tokenK_DROP_REPLICATION_SLOT`
`69`	`69`	`%tokenK_TIMELINE_HISTORY`
`70`		`-%tokenK_LABEL`
`71`		`-%tokenK_PROGRESS`
`72`		`-%tokenK_FAST`
`73`	`70`	`%tokenK_WAIT`
`74`		`-%tokenK_NOWAIT`
`75`		`-%tokenK_MAX_RATE`
`76`		`-%tokenK_WAL`
`77`		`-%tokenK_TABLESPACE_MAP`
`78`		`-%tokenK_NOVERIFY_CHECKSUMS`
`79`	`71`	`%tokenK_TIMELINE`
`80`	`72`	`%tokenK_PHYSICAL`
`81`	`73`	`%tokenK_LOGICAL`
`@@ -86,15 +78,13 @@ Node *replication_parse_result;`
`86`	`78`	`%tokenK_EXPORT_SNAPSHOT`
`87`	`79`	`%tokenK_NOEXPORT_SNAPSHOT`
`88`	`80`	`%tokenK_USE_SNAPSHOT`
`89`		`-%tokenK_MANIFEST`
`90`		`-%tokenK_MANIFEST_CHECKSUMS`
`91`	`81`
`92`	`82`	`%type<node>command`
`93`	`83`	`%type<node>base_backupstart_replicationstart_logical_replication`
`94`	`84`	`create_replication_slotdrop_replication_slotidentify_system`
`95`	`85`	`read_replication_slottimeline_historyshow`
`96`		`-%type<list>base_backup_legacy_opt_listgeneric_option_list`
`97`		`-%type<defelt>base_backup_legacy_optgeneric_option`
	`86`	`+%type<list>generic_option_list`
	`87`	`+%type<defelt>generic_option`
`98`	`88`	`%type<uintval>opt_timeline`
`99`	`89`	`%type<list>plugin_optionsplugin_opt_list`
`100`	`90`	`%type<defelt>plugin_opt_elem`
`@@ -167,15 +157,7 @@ var_name:IDENT{ $$ = $1; }`
`167`	`157`	`;`
`168`	`158`
`169`	`159`	`/*`
`170`		`- * BASE_BACKUP ( option [ 'value' ] [, ...] )`
`171`		`- *`
`172`		`- * We also still support the legacy syntax:`
`173`		`- *`
`174`		`- * BASE_BACKUP [LABEL '<label>'] [PROGRESS] [FAST] [WAL] [NOWAIT]`
`175`		`- * [MAX_RATE %d] [TABLESPACE_MAP] [NOVERIFY_CHECKSUMS]`
`176`		`- * [MANIFEST %s] [MANIFEST_CHECKSUMS %s]`
`177`		`- *`
`178`		`- * Future options should be supported only using the new syntax.`
	`160`	`+ * BASE_BACKUP [ ( option [ 'value' ] [, ...] ) ]`
`179`	`161`	`*/`
`180`	`162`	`base_backup:`
`181`	`163`	`K_BASE_BACKUP'('generic_option_list')'`
`@@ -184,74 +166,13 @@ base_backup:`
`184`	`166`	`cmd->options =$3;`
`185`	`167`	`$$ = (Node *) cmd;`
`186`	`168`	`}`
`187`		`-\|K_BASE_BACKUPbase_backup_legacy_opt_list`
	`169`	`+\|K_BASE_BACKUP`
`188`	`170`	`{`
`189`	`171`	`BaseBackupCmd *cmd = makeNode(BaseBackupCmd);`
`190`		`-cmd->options =$2;`
`191`	`172`	`$$ = (Node *) cmd;`
`192`	`173`	`}`
`193`	`174`	`;`
`194`	`175`
`195`		`-base_backup_legacy_opt_list:`
`196`		`-base_backup_legacy_opt_listbase_backup_legacy_opt`
`197`		`-{$$ = lappend($1,$2); }`
`198`		`-\|/* EMPTY*/`
`199`		`-{$$ = NIL; }`
`200`		`-;`
`201`		`-`
`202`		`-base_backup_legacy_opt:`
`203`		`-K_LABELSCONST`
`204`		`-{`
`205`		`-$$ = makeDefElem("label",`
`206`		`- (Node *)makeString($2), -1);`
`207`		`-}`
`208`		`-\|K_PROGRESS`
`209`		`-{`
`210`		`-$$ = makeDefElem("progress",`
`211`		`- (Node *)makeBoolean(true), -1);`
`212`		`-}`
`213`		`-\|K_FAST`
`214`		`-{`
`215`		`-$$ = makeDefElem("checkpoint",`
`216`		`- (Node *)makeString("fast"), -1);`
`217`		`-}`
`218`		`-\|K_WAL`
`219`		`-{`
`220`		`-$$ = makeDefElem("wal",`
`221`		`- (Node *)makeBoolean(true), -1);`
`222`		`-}`
`223`		`-\|K_NOWAIT`
`224`		`-{`
`225`		`-$$ = makeDefElem("wait",`
`226`		`- (Node *)makeBoolean(false), -1);`
`227`		`-}`
`228`		`-\|K_MAX_RATEUCONST`
`229`		`-{`
`230`		`-$$ = makeDefElem("max_rate",`
`231`		`- (Node *)makeInteger($2), -1);`
`232`		`-}`
`233`		`-\|K_TABLESPACE_MAP`
`234`		`-{`
`235`		`-$$ = makeDefElem("tablespace_map",`
`236`		`- (Node *)makeBoolean(true), -1);`
`237`		`-}`
`238`		`-\|K_NOVERIFY_CHECKSUMS`
`239`		`-{`
`240`		`-$$ = makeDefElem("verify_checksums",`
`241`		`- (Node *)makeBoolean(false), -1);`
`242`		`-}`
`243`		`-\|K_MANIFESTSCONST`
`244`		`-{`
`245`		`-$$ = makeDefElem("manifest",`
`246`		`- (Node *)makeString($2), -1);`
`247`		`-}`
`248`		`-\|K_MANIFEST_CHECKSUMSSCONST`
`249`		`-{`
`250`		`-$$ = makeDefElem("manifest_checksums",`
`251`		`- (Node *)makeString($2), -1);`
`252`		`-}`
`253`		`-;`
`254`		`-`
`255`	`176`	`create_replication_slot:`
`256`	`177`	`/* CREATE_REPLICATION_SLOT slot TEMPORARY PHYSICAL [options]*/`
`257`	`178`	`K_CREATE_REPLICATION_SLOTIDENTopt_temporaryK_PHYSICALcreate_slot_options`
`@@ -481,15 +402,7 @@ ident_or_keyword:`
`481`	`402`	`\|K_CREATE_REPLICATION_SLOT{$$ ="create_replication_slot"; }`
`482`	`403`	`\|K_DROP_REPLICATION_SLOT{$$ ="drop_replication_slot"; }`
`483`	`404`	`\|K_TIMELINE_HISTORY{$$ ="timeline_history"; }`
`484`		`-\|K_LABEL{$$ ="label"; }`
`485`		`-\|K_PROGRESS{$$ ="progress"; }`
`486`		`-\|K_FAST{$$ ="fast"; }`
`487`	`405`	`\|K_WAIT{$$ ="wait"; }`
`488`		`-\|K_NOWAIT{$$ ="nowait"; }`
`489`		`-\|K_MAX_RATE{$$ ="max_rate"; }`
`490`		`-\|K_WAL{$$ ="wal"; }`
`491`		`-\|K_TABLESPACE_MAP{$$ ="tablespace_map"; }`
`492`		`-\|K_NOVERIFY_CHECKSUMS{$$ ="noverify_checksums"; }`
`493`	`406`	`\|K_TIMELINE{$$ ="timeline"; }`
`494`	`407`	`\|K_PHYSICAL{$$ ="physical"; }`
`495`	`408`	`\|K_LOGICAL{$$ ="logical"; }`
`@@ -500,8 +413,6 @@ ident_or_keyword:`
`500`	`413`	`\|K_EXPORT_SNAPSHOT{$$ ="export_snapshot"; }`
`501`	`414`	`\|K_NOEXPORT_SNAPSHOT{$$ ="noexport_snapshot"; }`
`502`	`415`	`\|K_USE_SNAPSHOT{$$ ="use_snapshot"; }`
`503`		`-\|K_MANIFEST{$$ ="manifest"; }`
`504`		`-\|K_MANIFEST_CHECKSUMS{$$ ="manifest_checksums"; }`
`505`	`416`	`;`
`506`	`417`
`507`	`418`	`%%`

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

Lines changed: 0 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,17 +108,9 @@ identifier{ident_start}{ident_cont}*`
`108`	`108`	`%}`
`109`	`109`
`110`	`110`	`BASE_BACKUP{return K_BASE_BACKUP; }`
`111`		`-FAST{return K_FAST; }`
`112`	`111`	`IDENTIFY_SYSTEM{return K_IDENTIFY_SYSTEM; }`
`113`	`112`	`READ_REPLICATION_SLOT{return K_READ_REPLICATION_SLOT; }`
`114`	`113`	`SHOW{return K_SHOW; }`
`115`		`-LABEL{return K_LABEL; }`
`116`		`-NOWAIT{return K_NOWAIT; }`
`117`		`-PROGRESS{return K_PROGRESS; }`
`118`		`-MAX_RATE{return K_MAX_RATE; }`
`119`		`-WAL{return K_WAL; }`
`120`		`-TABLESPACE_MAP{return K_TABLESPACE_MAP; }`
`121`		`-NOVERIFY_CHECKSUMS{return K_NOVERIFY_CHECKSUMS; }`
`122`	`114`	`TIMELINE{return K_TIMELINE; }`
`123`	`115`	`START_REPLICATION{return K_START_REPLICATION; }`
`124`	`116`	`CREATE_REPLICATION_SLOT{return K_CREATE_REPLICATION_SLOT; }`
`@@ -134,8 +126,6 @@ EXPORT_SNAPSHOT{ return K_EXPORT_SNAPSHOT; }`
`134`	`126`	`NOEXPORT_SNAPSHOT{return K_NOEXPORT_SNAPSHOT; }`
`135`	`127`	`USE_SNAPSHOT{return K_USE_SNAPSHOT; }`
`136`	`128`	`WAIT{return K_WAIT; }`
`137`		`-MANIFEST{return K_MANIFEST; }`
`138`		`-MANIFEST_CHECKSUMS{return K_MANIFEST_CHECKSUMS; }`
`139`	`129`
`140`	`130`	`{space}+{/* do nothing */ }`
`141`	`131`

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!

Commit9cd28c2

File tree

3 files changed

3 files changed

`‎doc/src/sgml/protocol.sgml`

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

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

0 commit comments