You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2024/01/31 15:54:47 UTC
(doris) 35/37: [fix](compile)Fix Ambiguous regex Namespace Issue on MacOS Compilation (#30652)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 65076949ef7a5b2dd713e69189f7ce0f0db7273b
Author: zy-kkk <zh...@gmail.com>
AuthorDate: Wed Jan 31 20:52:33 2024 +0800
[fix](compile)Fix Ambiguous regex Namespace Issue on MacOS Compilation (#30652)
---
be/src/olap/delete_handler.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/be/src/olap/delete_handler.cpp b/be/src/olap/delete_handler.cpp
index 29f84563627..b3096d353a0 100644
--- a/be/src/olap/delete_handler.cpp
+++ b/be/src/olap/delete_handler.cpp
@@ -303,7 +303,7 @@ Status DeleteHandler::parse_condition(const std::string& condition_str, TConditi
// group3: ((?:[\s\S]+)?) matches "1597751948193618247 and length(source)<1;\n;\n"
const char* const CONDITION_STR_PATTERN =
R"(([\w$#%]+)\s*((?:=)|(?:!=)|(?:>>)|(?:<<)|(?:>=)|(?:<=)|(?:\*=)|(?:IS))\s*('((?:[\s\S]+)?)'|(?:[\s\S]+)?))";
- regex ex(CONDITION_STR_PATTERN);
+ boost::regex ex(CONDITION_STR_PATTERN);
if (regex_match(condition_str, what, ex)) {
if (condition_str.size() != what[0].str().size()) {
matched = false;
@@ -311,7 +311,7 @@ Status DeleteHandler::parse_condition(const std::string& condition_str, TConditi
} else {
matched = false;
}
- } catch (regex_error& e) {
+ } catch (boost::regex_error& e) {
VLOG_NOTICE << "fail to parse expr. [expr=" << condition_str << "; error=" << e.what()
<< "]";
matched = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org