Commit 77ce50a4 authored by Tom Lane's avatar Tom Lane

Fix psql lexer to avoid use of backtracking.

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.
parent 2e95f1f0
......@@ -723,6 +723,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.
*/
......@@ -913,7 +930,7 @@ other .
}
}
:[A-Za-z0-9_]* {
:[A-Za-z0-9_]+ {
/* Possible psql variable substitution */
if (option_type == OT_VERBATIM)
ECHO;
......@@ -960,6 +977,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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment