Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LABEL in could be any string #3424

Merged
merged 2 commits into from
Dec 13, 2021
Merged

LABEL in could be any string #3424

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acdad69
LABEL in '``' could be any string
liwenhui-soul Dec 7, 2021
50528f9
Merge branch 'master' into lwh
critical27 Dec 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions src/parser/scanner.lex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ static constexpr size_t MAX_STRING = 4096;

%x DQ_STR
%x SQ_STR
%x LB_STR
%x COMMENT

blanks ([ \t\n]+)
Expand Down Expand Up @@ -327,17 +328,19 @@ CHINESE_LABEL ({U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U})+
}
return TokenType::LABEL;
}
\`{LABEL}\` {
yylval->strval = new std::string(yytext + 1, yyleng - 2);
\` { BEGIN(LB_STR); sbufPos_ = 0; }
<LB_STR>\` {
yylval->strval = new std::string(sbuf(), sbufPos_);
BEGIN(INITIAL);
if (yylval->strval->size() > MAX_STRING) {
auto error = "Out of range of the LABEL length, "
"the max length of LABEL is " +
std::to_string(MAX_STRING) + ":";
"the max length of LABEL is " +
std::to_string(MAX_STRING) + ":";
delete yylval->strval;
throw GraphParser::syntax_error(*yylloc, error);
}
return TokenType::LABEL;
}
}
{IP_OCTET}(\.{IP_OCTET}){3} {
yylval->strval = new std::string(yytext, yyleng);
return TokenType::IPV4;
Expand Down Expand Up @@ -382,11 +385,11 @@ CHINESE_LABEL ({U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U})+
BEGIN(INITIAL);
return TokenType::STRING;
}
<DQ_STR,SQ_STR><<EOF>> {
<DQ_STR,SQ_STR,LB_STR><<EOF>> {
// Must match '' or ""
throw GraphParser::syntax_error(*yylloc, "Unterminated string: ");
}
<DQ_STR,SQ_STR>\n { yyterminate(); }
<DQ_STR,SQ_STR,LB_STR>\n { yyterminate(); }
<DQ_STR>[^\\\n\"]+ {
makeSpaceForString(yyleng);
::strncpy(sbuf() + sbufPos_, yytext, yyleng);
Expand All @@ -397,7 +400,12 @@ CHINESE_LABEL ({U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U})+
::strncpy(sbuf() + sbufPos_, yytext, yyleng);
sbufPos_ += yyleng;
}
<DQ_STR,SQ_STR>\\{OCT}{1,3} {
<LB_STR>[^\\\n\`]+ {
makeSpaceForString(yyleng);
::strncpy(sbuf() + sbufPos_, yytext, yyleng);
sbufPos_ += yyleng;
}
<DQ_STR,SQ_STR,LB_STR>\\{OCT}{1,3} {
if (FLAGS_disable_octal_escape_char) {
makeSpaceForString(yyleng);
::strncpy(sbuf() + sbufPos_, yytext, yyleng);
Expand All @@ -412,7 +420,7 @@ CHINESE_LABEL ({U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U})+
sbuf()[sbufPos_++] = val;
}
}
<DQ_STR,SQ_STR>\\{DEC}+ {
<DQ_STR,SQ_STR,LB_STR>\\{DEC}+ {
if (FLAGS_disable_octal_escape_char) {
makeSpaceForString(yyleng);
::strncpy(sbuf() + sbufPos_, yytext, yyleng);
Expand All @@ -421,37 +429,37 @@ CHINESE_LABEL ({U2}{U}|{U3}{U}{U}|{U4}{U}{U}{U})+
yyterminate();
}
}
<DQ_STR,SQ_STR>\\[uUxX]{HEX}{4} {
<DQ_STR,SQ_STR,LB_STR>\\[uUxX]{HEX}{4} {
auto encoded = folly::codePointToUtf8(std::strtoul(yytext+2, nullptr, 16));
makeSpaceForString(encoded.size());
::strncpy(sbuf() + sbufPos_, encoded.data(), encoded.size());
sbufPos_ += encoded.size();
}
<DQ_STR,SQ_STR>\\n {
<DQ_STR,SQ_STR,LB_STR>\\n {
makeSpaceForString(1);
sbuf()[sbufPos_++] = '\n';
}
<DQ_STR,SQ_STR>\\t {
<DQ_STR,SQ_STR,LB_STR>\\t {
makeSpaceForString(1);
sbuf()[sbufPos_++] = '\t';
}
<DQ_STR,SQ_STR>\\r {
<DQ_STR,SQ_STR,LB_STR>\\r {
makeSpaceForString(1);
sbuf()[sbufPos_++] = '\r';
}
<DQ_STR,SQ_STR>\\b {
<DQ_STR,SQ_STR,LB_STR>\\b {
makeSpaceForString(1);
sbuf()[sbufPos_++] = '\b';
}
<DQ_STR,SQ_STR>\\f {
<DQ_STR,SQ_STR,LB_STR>\\f {
makeSpaceForString(1);
sbuf()[sbufPos_++] = '\f';
}
<DQ_STR,SQ_STR>\\(.|\n) {
<DQ_STR,SQ_STR,LB_STR>\\(.|\n) {
makeSpaceForString(1);
sbuf()[sbufPos_++] = yytext[1];
}
<DQ_STR,SQ_STR>\\ {
<DQ_STR,SQ_STR,LB_STR>\\ {
// This rule should have never been matched,
// but without this, it somehow triggers the `nodefault' warning of flex.
yyterminate();
Expand Down
13 changes: 13 additions & 0 deletions src/parser/test/ParserTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3112,4 +3112,17 @@ TEST_F(ParserTest, DetectMemoryLeakTest) {
}
}

TEST_F(ParserTest, TestNameLabel) {
{
std::string query = "CREATE TAG person127.0.0.1(name STRING);";
auto result = parse(query);
ASSERT_FALSE(result.ok()) << result.status();
}
{
std::string query = "CREATE TAG `person127.0.0.1`(name STRING);";
auto result = parse(query);
ASSERT_TRUE(result.ok()) << result.status();
}
}

} // namespace nebula