database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

Allow backslash line continuations in pgbench's meta commands.

Browse Source 
A pgbench meta command can now be continued onto additional line(s) of a
script file by writing backslash-return.  The continuation marker is
equivalent to white space in that it separates tokens.

Eventually it'd be nice to have the same thing in psql, but that will
be a much larger project.

Fabien Coelho, reviewed by Rafia Sabih

Discussion: https://postgr.es/m/alpine.DEB.2.20.1610031049310.19411@lancre
This commit is contained in:
Tom Lane 2017-01-20 11:10:02 -05:00
parent 9547370950
commit cdc2a70470
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/sgml/ref/pgbench.sgml
View File

@ -809,7 +809,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
<para>
Script file meta commands begin with a backslash (<literal>\</>) and
extend to the end of the line.
normally extend to the end of the line, although they can be continued
to additional lines by writing backslash-return.
Arguments to a meta command are separated by white space.
These meta commands are supported:
</para>
@ -838,7 +839,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
Examples:
<programlisting>
\set ntellers 10 * :scale
\set aid (1021 * random(1, 100000 * :scale)) % (100000 * :scale) + 1
\set aid (1021 * random(1, 100000 * :scale)) % \
(100000 * :scale) + 1
</programlisting></para>
</listitem>
</varlistentry>

21
src/bin/pgbench/exprscan.l
View File

@ -66,6 +66,9 @@ space [ \t\r\f\v]
nonspace [^ \t\r\f\v\n]
newline [\n]
/* Line continuation marker */
continuation \\{newline}
/* Exclusive states */
%x EXPR
@ -96,8 +99,20 @@ newline [\n]
return 1;
}
/*
* We need this rule to avoid returning "word\" instead of recognizing
* a continuation marker just after a word:
*/
{nonspace}+{continuation} {
/* Found "word\\\n", emit and return just "word" */
psqlscan_emit(cur_state, yytext, yyleng - 2);
return 1;
}
{space}+ { /* ignore */ }
{continuation} { /* ignore */ }
{newline} {
/* report end of command */
last_was_newline = true;
@ -138,14 +153,16 @@ newline [\n]
return FUNCTION;
}
{space}+ { /* ignore */ }
{continuation} { /* ignore */ }
{newline} {
/* report end of command */
last_was_newline = true;
return 0;
}
{space}+ { /* ignore */ }
. {
/*
* must strdup yytext so that expr_yyerror_more doesn't