hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CP] [parser]: const in /*!xxx */ shouldn't be parameterized.

Browse Source
This commit is contained in:
wangt1xiuyi
2023-04-18 13:11:41 +00:00
committed by ob-robot
parent 4ebbfc88a9
commit 972723ed66
4 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/sql/parser/ob_fast_parser.cpp
View File

@ -110,7 +110,6 @@ ObFastParserBase::ObFastParserBase(
is_batched_multi_stmt_split_on_(fp_ctx.enable_batched_multi_stmt_),
is_udr_mode_(fp_ctx.is_udr_mode_),
def_name_ctx_(fp_ctx.def_name_ctx_),
is_mysql_compatible_comment_(false),
cur_token_begin_pos_(0), copy_begin_pos_(0), copy_end_pos_(0),
tmp_buf_(nullptr), tmp_buf_len_(0), last_escape_check_pos_(0),
param_node_list_(nullptr), tail_param_node_(nullptr),
@ -1479,10 +1478,11 @@ int ObFastParserBase::process_double_quote()
}
// Until "*/" appears, all characters before it should be ignored
int ObFastParserBase::process_comment_content()
int ObFastParserBase::process_comment_content(bool is_mysql_comment)
{
int ret = OB_SUCCESS;
cur_token_type_ = IGNORE_TOKEN;
// if is in /*! xxx */ the token tyep should be normal
cur_token_type_ = is_mysql_comment ? NORMAL_TOKEN : IGNORE_TOKEN;
bool is_match = false;
char ch = raw_sql_.scan();
while (!raw_sql_.is_search_end()) {
@ -2225,18 +2225,7 @@ int ObFastParserMysql::parse_next_token()
case '/': {
if ('*' == raw_sql_.peek()) {
raw_sql_.scan();
if ('!' == raw_sql_.peek()) {
is_mysql_compatible_comment_ = true;
cur_token_type_ = IGNORE_TOKEN;
raw_sql_.scan(1);
// if is mysql_compatble_comment with version. e.g., /*!50600 xxx*/ ignore the first five digits.
if (is_n_continuous_digits(raw_sql_.raw_sql_, raw_sql_.cur_pos_, raw_sql_.raw_sql_len_, 5)) {
raw_sql_.scan(5);
}
raw_sql_.scan(1);
} else {
OZ (process_comment_content());
}
OZ (process_comment_content(('!' == raw_sql_.peek())));
} else {
cur_token_type_ = NORMAL_TOKEN;
raw_sql_.scan();
@ -2244,14 +2233,8 @@ int ObFastParserMysql::parse_next_token()
break;
}
case '*': {
if (is_mysql_compatible_comment_ && '/' == raw_sql_.peek()) {
is_mysql_compatible_comment_ = false;
cur_token_type_ = IGNORE_TOKEN;
raw_sql_.scan(2);
} else {
cur_token_type_ = NORMAL_TOKEN;
raw_sql_.scan();
}
cur_token_type_ = NORMAL_TOKEN;
raw_sql_.scan();
break;
}
case ';': {

3
src/sql/parser/ob_fast_parser.h
View File

@ -455,7 +455,7 @@ protected:
// Used to process '\"' and keep all characters before the next '\"'
int process_double_quote();
// Until "*/" appears, all characters before it should be ignored
int process_comment_content();
int process_comment_content(bool is_mysql_comment = false);
/**
* Used to check the escape character encountered in the string
* Character sets marked with escape_with_backslash_is_dangerous, such as
@ -533,7 +533,6 @@ protected:
bool is_batched_multi_stmt_split_on_;
bool is_udr_mode_;
QuestionMarkDefNameCtx *def_name_ctx_;
bool is_mysql_compatible_comment_;
int64_t cur_token_begin_pos_;
int64_t copy_begin_pos_;
int64_t copy_end_pos_;

8
src/sql/parser/sql_parser_base.h
View File

@ -1007,4 +1007,12 @@ do {\
} \
} while(0); \
// if the const is in /*! xx**/, we should ignore the const in fast parser.
#define CHECK_MYSQL_COMMENT(p, node)\
do {\
if (p->mysql_compatible_comment_) {\
node->is_hidden_const_ = 1;\
}\
} while(0);\
#endif /* OCEANBASE_SRC_SQL_PARSER_SQL_PARSER_BASE_H_ */

6
src/sql/parser/sql_parser_mysql_mode.y
View File

@ -1009,7 +1009,11 @@ INTNUM { $$ = $1; $$->param_num_ = 1;}
;
expr_const:
literal { $$ = $1; }
literal
{
$$ = $1;
CHECK_MYSQL_COMMENT(result, $$);
}
| SYSTEM_VARIABLE { $$ = $1; }
| QUESTIONMARK { $$ = $1; }
| global_or_session_alias '.' column_name