database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-18 17:42:25 +03:00
Code Activity

Fix psql lexer to avoid use of backtracking.

Browse Source 
Per previous experimentation, backtracking slows down lexing performance
significantly (by about a third).  It's usually pretty easy to avoid, just
need to have rules that accept an incomplete construct and do whatever the
lexer would have done otherwise.

The backtracking was introduced by the patch that added quoted variable
substitution.  Back-patch to 9.0 where that was added.
This commit is contained in:
Tom Lane
2011-08-25 14:33:08 -04:00
parent b7cd5c836a
commit 9354f5b76a
1 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/bin/psql/psqlscan.l
View File

@ -722,6 +722,23 @@ other .
escape_variable(true);
}
/*
* These rules just avoid the need for scanner backup if one of the
* two rules above fails to match completely.
*/
:'[A-Za-z0-9_]* {
/* Throw back everything but the colon */
yyless(1);
ECHO;
}
:\"[A-Za-z0-9_]* {
/* Throw back everything but the colon */
yyless(1);
ECHO;
}
/*
* Back to backend-compatible rules.
*/
@ -912,7 +929,7 @@ other .
}
}
:[A-Za-z0-9_]* {
:[A-Za-z0-9_]+ {
/* Possible psql variable substitution */
if (option_type == OT_VERBATIM)
ECHO;
@ -959,6 +976,20 @@ other .
}
}
:'[A-Za-z0-9_]* {
/* Throw back everything but the colon */
yyless(1);
ECHO;
BEGIN(xslashdefaultarg);
}
:\"[A-Za-z0-9_]* {
/* Throw back everything but the colon */
yyless(1);
ECHO;
BEGIN(xslashdefaultarg);
}
"|" {
ECHO;
if (option_type == OT_FILEPIPE)