database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Make walsender options order-independent

Browse Source 
While doing this, also move base backup options into
a struct instead of increasing the number of parameters
to multiple functions for each new option.
This commit is contained in:
Magnus Hagander
2011-01-23 23:39:18 +01:00
parent 39e911e28a
commit e5487f65fd
5 changed files with 109 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/backend/replication/repl_gram.y
View File

@@ -15,6 +15,8 @@
#include "postgres.h"
#include "nodes/makefuncs.h"
#include "nodes/parsenodes.h"
#include "replication/replnodes.h"
#include "replication/walsender.h"
@@ -55,6 +57,8 @@ Node *replication_parse_result;
XLogRecPtr recptr;
Node *node;
List *list;
DefElem *defelt;
}
/* Non-keyword tokens */
@@ -71,9 +75,8 @@ Node *replication_parse_result;
%type <node> command
%type <node> base_backup start_replication identify_system
%type <boolval> opt_progress opt_fast
%type <str> opt_label
%type <list> base_backup_opt_list
%type <defelt> base_backup_opt
%%
firstcmd: command opt_semicolon
@@ -106,28 +109,34 @@ identify_system:
* BASE_BACKUP [LABEL <label>] [PROGRESS] [FAST]
*/
base_backup:
K_BASE_BACKUP opt_label opt_progress opt_fast
K_BASE_BACKUP base_backup_opt_list
{
BaseBackupCmd *cmd = (BaseBackupCmd *) makeNode(BaseBackupCmd);
cmd->label = $2;
cmd->progress = $3;
cmd->fastcheckpoint = $4;
cmd->options = $2;
$$ = (Node *) cmd;
}
;
opt_label: K_LABEL SCONST { $$ = $2; }
| /* EMPTY */ { $$ = NULL; }
;
base_backup_opt_list: base_backup_opt_list base_backup_opt { $$ = lappend($1, $2); }
| /* EMPTY */ { $$ = NIL; }
base_backup_opt:
K_LABEL SCONST
{
$$ = makeDefElem("label",
(Node *)makeString($2));
}
| K_PROGRESS
{
$$ = makeDefElem("progress",
(Node *)makeInteger(TRUE));
}
| K_FAST
{
$$ = makeDefElem("fast",
(Node *)makeInteger(TRUE));
}
opt_progress: K_PROGRESS { $$ = true; }
| /* EMPTY */ { $$ = false; }
;
opt_fast: K_FAST { $$ = true; }
| /* EMPTY */ { $$ = false; }
;
/*
* START_REPLICATION %X/%X