[PATCH v3 20/22] libtracefs: Allow trace_sql() to take keywords for fields with backslash

From: Steven Rostedt
Date: Tue Aug 03 2021 - 13:06:50 EST


From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx>

Some events have fields with keywords, and the parsing will not let it
work. For example, you can have:

select from from regcache_drop_region

And that will produce a syntax error, as the from will confuse the parser.
Allow fields to start with a backslash, which will allow the parser to see
"from" as a field and not as a keyword. That is:

select \from from regcache_drop_region

will work as expected. Note, any field can start with a backslash, and the
starting backslash will be ignored.

Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
---
Documentation/libtracefs-sql.txt | 20 ++++++++++++++++++++
src/sqlhist.l | 6 ++++--
2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Documentation/libtracefs-sql.txt b/Documentation/libtracefs-sql.txt
index ee8d5c1d63c7..bc2811cfe08b 100644
--- a/Documentation/libtracefs-sql.txt
+++ b/Documentation/libtracefs-sql.txt
@@ -162,6 +162,26 @@ select start.pid, (end.TIMESTAMP_USECS - start.TIMESTAMP_USECS) as lat from sche
WHERE start.prio < 100 || end.prev_prio < 100
--

+
+KEYWORDS AS EVENT FIELDS
+------------------------
+
+In some cases, an event may have a keyword. For example, regcache_drop_region has "from"
+as a field and the following will not work
+
+[source,c]
+--
+ select from from regcache_drop_region
+--
+
+In such cases, add a backslash to the conflicting field, and this will tell the parser
+that the "from" is a field and not a keyword:
+
+[source,c]
+--
+ select \from from regcache_drop_region
+--
+
HISTOGRAMS
----------

diff --git a/src/sqlhist.l b/src/sqlhist.l
index f9e0fcc17e63..897daac7d2a8 100644
--- a/src/sqlhist.l
+++ b/src/sqlhist.l
@@ -25,7 +25,7 @@ extern int my_yyinput(void *extra, char *buf, int max);
%option reentrant
%option bison-bridge

-field [a-z_][a-z0-9_\.]*
+field \\?[a-z_][a-z0-9_\.]*
qstring \"[^\"]*\"
hexnum 0x[0-9a-f]+
number [0-9a-f]+
@@ -46,8 +46,10 @@ where { HANDLE_COLUMN; return WHERE; }
}

{field} {
+ const char *str = yyg->yytext_r;
HANDLE_COLUMN;
- yylval->string = store_str(TRACE_SB, yyg->yytext_r);
+ if (str[0] == '\\') { str++; };
+ yylval->string = store_str(TRACE_SB, str);
return FIELD;
}

--
2.30.2