thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 16:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not throw exception in OptimizedRegularExpressionImpl::analyze

Browse Source
This commit is contained in:
Han Fei 2023-07-22 18:10:54 +02:00
parent 2e67a8927b
commit dab954a92d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Common/OptimizedRegularExpression.cpp
View File

@ -423,6 +423,7 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
bool & is_trivial, bool & is_trivial,
bool & required_substring_is_prefix, bool & required_substring_is_prefix,
std::vector<std::string> & alternatives) std::vector<std::string> & alternatives)
try
{ {
Literals alternative_literals; Literals alternative_literals;
Literal required_literal; Literal required_literal;
@ -432,12 +433,20 @@ void OptimizedRegularExpressionImpl<thread_safe>::analyze(
for (auto & lit : alternative_literals) for (auto & lit : alternative_literals)
alternatives.push_back(std::move(lit.literal)); alternatives.push_back(std::move(lit.literal));
} }
catch(...)
{
required_substring = "";
is_trivial = false;
required_substring_is_prefix = false;
alternatives.clear();
std::cerr << "Analyze RegularExpression failed, got error: {}" << DB::getCurrentExceptionMessage(false) << "\n";
}
template <bool thread_safe> template <bool thread_safe>
OptimizedRegularExpressionImpl<thread_safe>::OptimizedRegularExpressionImpl(const std::string & regexp_, int options) OptimizedRegularExpressionImpl<thread_safe>::OptimizedRegularExpressionImpl(const std::string & regexp_, int options)
{ {
std::vector<std::string> alternativesDummy; /// this vector extracts patterns a,b,c from pattern (a|b|c). for now it's not used. std::vector<std::string> alternatives_dummy; /// this vector extracts patterns a,b,c from pattern (a|b|c). for now it's not used.
analyze(regexp_, required_substring, is_trivial, required_substring_is_prefix, alternativesDummy); analyze(regexp_, required_substring, is_trivial, required_substring_is_prefix, alternatives_dummy);
/// Just three following options are supported /// Just three following options are supported

2
tests/queries/0_stateless/02831_regexp_analyze_recursion.sql
View File

@ -1 +1 @@
SELECT match('', repeat('(', 100000)); -- { serverError 306 } SELECT match('', repeat('(', 100000)); -- { serverError 427 }