Skip to content

[Fix](regexp) make dot not match newline in REGEXP by default #60806

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

Closed
linrrzqqq wants to merge 1 commit into from
Closed

[Fix](regexp) make dot not match newline in REGEXP by default #60806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 2 additions & 7 deletions be/src/vec/functions/like.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ Status LikeSearchState::clone(LikeSearchState& cloned) {

RE2::Options opts;
opts.set_never_nl(false);
opts.set_dot_nl(true);
cloned.regex = std::make_unique<RE2>(re_pattern, opts);
if (!cloned.regex->ok()) {
return Status::InternalError("Invalid regex expression: {}", re_pattern);
Expand Down Expand Up @@ -405,7 +404,6 @@ Status FunctionLikeBase::regexp_fn_scalar(const LikeSearchState* state, const St
const StringRef& pattern, unsigned char* result) {
RE2::Options opts;
opts.set_never_nl(false);
opts.set_dot_nl(true);
re2::RE2 re(re2::StringPiece(pattern.data, pattern.size), opts);
if (re.ok()) {
*result = RE2::PartialMatch(re2::StringPiece(val.data, val.size), re);
Expand Down Expand Up @@ -471,7 +469,6 @@ Status FunctionLikeBase::regexp_fn(const LikeSearchState* state, const ColumnStr
} else { // fallback to re2
RE2::Options opts;
opts.set_never_nl(false);
opts.set_dot_nl(true);
re2::RE2 re(re_pattern, opts);
if (re.ok()) {
auto sz = val.size();
Expand All @@ -492,8 +489,8 @@ Status FunctionLikeBase::regexp_fn(const LikeSearchState* state, const ColumnStr
Status FunctionLikeBase::hs_prepare(FunctionContext* context, const char* expression,
hs_database_t** database, hs_scratch_t** scratch) {
hs_compile_error_t* compile_err;
auto res = hs_compile(expression, HS_FLAG_DOTALL | HS_FLAG_ALLOWEMPTY | HS_FLAG_UTF8,
HS_MODE_BLOCK, nullptr, database, &compile_err);
auto res = hs_compile(expression, HS_FLAG_ALLOWEMPTY | HS_FLAG_UTF8, HS_MODE_BLOCK, nullptr,
database, &compile_err);

if (res != HS_SUCCESS) {
*database = nullptr;
Expand Down Expand Up @@ -956,7 +953,6 @@ Status FunctionLike::construct_like_const_state(FunctionContext* context, const

RE2::Options opts;
opts.set_never_nl(false);
opts.set_dot_nl(true);
state->search_state.regex = std::make_unique<RE2>(re_pattern, opts);
if (!state->search_state.regex->ok()) {
return Status::InternalError("Invalid regex expression: {}(origin: {})", re_pattern,
Expand Down Expand Up @@ -1048,7 +1044,6 @@ Status FunctionRegexpLike::open(FunctionContext* context,
state->search_state.hs_scratch.reset();
RE2::Options opts;
opts.set_never_nl(false);
opts.set_dot_nl(true);
state->search_state.regex = std::make_unique<RE2>(pattern_str, opts);
if (!state->search_state.regex->ok()) {
if (!context->state()->enable_extended_regex()) {
Expand Down
3 changes: 3 additions & 0 deletions regression-test/data/query_p0/sql_functions/string_functions/test_string_function_regexp.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,9 @@ false
-- !regexp_fn_9 --
true

-- !regexp_fn_10 --
false

-- !sql_utf1 --
true

Expand Down
1 change: 1 addition & 0 deletions ...on-test/suites/query_p0/sql_functions/string_functions/test_string_function_regexp.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ suite("test_string_function_regexp") {
qt_regexp_fn_7 'SELECT regexp(\'foobar\', \'(?<=foo)bar\');'
qt_regexp_fn_8 'SELECT regexp(\'foobar\', \'(?<!foo)bar\');'
qt_regexp_fn_9 'SELECT regexp(\'Hello\', \'(?i)hello\');'
qt_regexp_fn_10 'SELECT regexp(\'multi\nline\', \'multi.line\');'
sql "set enable_extended_regex = false;"

qt_sql_utf1 """ select '皖12345' REGEXP '^[皖][0-9]{5}\$'; """
Expand Down