Skip to content

Commit

Permalink
Revert "Fixed issue using unreserved aliased keyword as label (vesoft…
Browse files Browse the repository at this point in the history 
…-inc#2199)" (vesoft-inc#2205)

This reverts commit 75a9ca7.
  • Loading branch information
@dutor
dutor authored Jul 7, 2020
1 parent 4b5bdd6 commit cc91cbc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 22 deletions.
5 changes: 1 addition & 4 deletions src/graph/test/SchemaTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,8 +621,7 @@ TEST_F(SchemaTest, TestTagAndEdge) {
{
cpp2::ExecutionResponse resp;
std::string query = "CREATE TAG upper(name string, ACCOUNT string, "
"age int, gender string, row_timestamp timestamp DEFAULT 100, "
"value int, values string)";
"age int, gender string, row_timestamp timestamp DEFAULT 100)";
auto code = client->execute(query, resp);
ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code);
}
Expand All @@ -638,8 +637,6 @@ TEST_F(SchemaTest, TestTagAndEdge) {
{"age", "int"},
{"gender", "string"},
{"row_timestamp", "timestamp"},
{"value", "int"},
{"values", "string"},
};
ASSERT_TRUE(verifyResult(resp, expected));
}
Expand Down
20 changes: 7 additions & 13 deletions src/parser/parser.yy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static constexpr size_t MAX_ABS_INTEGER = 9223372036854775808ULL;

/* keywords */
%token KW_GO KW_AS KW_TO KW_OR KW_AND KW_XOR KW_USE KW_SET KW_FROM KW_WHERE KW_ALTER
%token KW_MATCH KW_INSERT KW_VALUE KW_VALUES KW_YIELD KW_RETURN KW_CREATE KW_VERTEX KW_OFFLINE
%token KW_MATCH KW_INSERT KW_VALUES KW_YIELD KW_RETURN KW_CREATE KW_VERTEX KW_OFFLINE
%token KW_EDGE KW_EDGES KW_STEPS KW_OVER KW_UPTO KW_REVERSELY KW_SPACE KW_DELETE KW_FIND KW_REBUILD
%token KW_INT KW_DOUBLE KW_STRING KW_BOOL KW_TAG KW_TAGS KW_UNION KW_INTERSECT KW_MINUS
%token KW_NO KW_OVERWRITE KW_IN KW_DESCRIBE KW_DESC KW_SHOW KW_HOSTS KW_PART KW_PARTS KW_TIMESTAMP KW_ADD
Expand Down Expand Up @@ -256,7 +256,6 @@ name_label

unreserved_keyword
: KW_SPACE { $$ = new std::string("space"); }
| KW_VALUE { $$ = new std::string("value"); }
| KW_VALUES { $$ = new std::string("values"); }
| KW_HOSTS { $$ = new std::string("hosts"); }
| KW_SPACES { $$ = new std::string("spaces"); }
Expand Down Expand Up @@ -1306,16 +1305,11 @@ assignment_sentence
}
;

kw_values
: KW_VALUE { }
| KW_VALUES { }
;

insert_vertex_sentence
: KW_INSERT KW_VERTEX vertex_tag_list kw_values vertex_row_list {
: KW_INSERT KW_VERTEX vertex_tag_list KW_VALUES vertex_row_list {
$$ = new InsertVertexSentence($3, $5);
}
| KW_INSERT KW_VERTEX KW_NO KW_OVERWRITE vertex_tag_list kw_values vertex_row_list {
| KW_INSERT KW_VERTEX KW_NO KW_OVERWRITE vertex_tag_list KW_VALUES vertex_row_list {
$$ = new InsertVertexSentence($5, $7, false /* not overwritable */);
}
;
Expand Down Expand Up @@ -1389,29 +1383,29 @@ value_list
;

insert_edge_sentence
: KW_INSERT KW_EDGE name_label L_PAREN R_PAREN kw_values edge_row_list {
: KW_INSERT KW_EDGE name_label L_PAREN R_PAREN KW_VALUES edge_row_list {
auto sentence = new InsertEdgeSentence();
sentence->setEdge($3);
sentence->setProps(new PropertyList());
sentence->setRows($7);
$$ = sentence;
}
| KW_INSERT KW_EDGE name_label L_PAREN prop_list R_PAREN kw_values edge_row_list {
| KW_INSERT KW_EDGE name_label L_PAREN prop_list R_PAREN KW_VALUES edge_row_list {
auto sentence = new InsertEdgeSentence();
sentence->setEdge($3);
sentence->setProps($5);
sentence->setRows($8);
$$ = sentence;
}
| KW_INSERT KW_EDGE KW_NO KW_OVERWRITE name_label L_PAREN R_PAREN kw_values edge_row_list {
| KW_INSERT KW_EDGE KW_NO KW_OVERWRITE name_label L_PAREN R_PAREN KW_VALUES edge_row_list {
auto sentence = new InsertEdgeSentence();
sentence->setOverwrite(false);
sentence->setEdge($5);
sentence->setProps(new PropertyList());
sentence->setRows($9);
$$ = sentence;
}
| KW_INSERT KW_EDGE KW_NO KW_OVERWRITE name_label L_PAREN prop_list R_PAREN kw_values edge_row_list {
| KW_INSERT KW_EDGE KW_NO KW_OVERWRITE name_label L_PAREN prop_list R_PAREN KW_VALUES edge_row_list {
auto sentence = new InsertEdgeSentence();
sentence->setOverwrite(false);
sentence->setEdge($5);
Expand Down
4 changes: 1 addition & 3 deletions src/parser/scanner.lex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ FROM ([Ff][Rr][Oo][Mm])
WHERE ([Ww][Hh][Ee][Rr][Ee])
MATCH ([Mm][Aa][Tt][Cc][Hh])
INSERT ([Ii][Nn][Ss][Ee][Rr][Tt])
VALUE ([Vv][Aa][Ll][Uu][Ee])
VALUES ([Vv][Aa][Ll][Uu][Ee][Ss])
VALUES ([Vv][Aa][Ll][Uu][Ee][Ss]?)
YIELD ([Yy][Ii][Ee][Ll][Dd])
RETURN ([Rr][Ee][Tt][Uu][Rr][Nn])
CREATE ([Cc][Rr][Ee][Aa][Tt][Ee])
Expand Down Expand Up @@ -258,7 +257,6 @@ RECOVER ([Rr][Ee][Cc][Oo][Vv][Ee][Rr])
{SPACE} { return TokenType::KW_SPACE; }
{SPACES} { return TokenType::KW_SPACES; }
{VALUES} { return TokenType::KW_VALUES; }
{VALUE} { return TokenType::KW_VALUE; }
{USER} { return TokenType::KW_USER; }
{USERS} { return TokenType::KW_USERS; }
{PASSWORD} { return TokenType::KW_PASSWORD; }
Expand Down
4 changes: 2 additions & 2 deletions src/parser/test/ScannerTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ TEST(Scanner, Basic) {
CHECK_SEMANTIC_TYPE("match", TokenType::KW_MATCH),
CHECK_SEMANTIC_TYPE("INSERT", TokenType::KW_INSERT),
CHECK_SEMANTIC_TYPE("insert", TokenType::KW_INSERT),
CHECK_SEMANTIC_TYPE("VALUE", TokenType::KW_VALUE),
CHECK_SEMANTIC_TYPE("value", TokenType::KW_VALUE),
CHECK_SEMANTIC_TYPE("VALUE", TokenType::KW_VALUES),
CHECK_SEMANTIC_TYPE("value", TokenType::KW_VALUES),
CHECK_SEMANTIC_TYPE("VALUES", TokenType::KW_VALUES),
CHECK_SEMANTIC_TYPE("values", TokenType::KW_VALUES),
CHECK_SEMANTIC_TYPE("YIELD", TokenType::KW_YIELD),
Expand Down

0 comments on commit cc91cbc

Please sign in to comment.