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

dbms: fixed error [#METR-15387].

Browse Source
This commit is contained in:
Alexey Milovidov 2015-04-03 19:16:02 +03:00
parent e267ba87f0
commit f1dc2f4775
5 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dbms/include/DB/Functions/FunctionsStringSearch.h
View File

@ -395,14 +395,21 @@ struct MatchImpl
if (required_substring.empty()) if (required_substring.empty())
{ {
size_t prev_offset = 0; if (!regexp->getRE2()) /// Пустой регексп. Всегда матчит.
for (size_t i = 0; i < size; ++i)
{ {
res[i] = revert ^ regexp->getRE2()->Match( memset(&res[0], 1, size * sizeof(res[0]));
re2_st::StringPiece(reinterpret_cast<const char *>(&data[prev_offset]), offsets[i] - prev_offset - 1), }
0, offsets[i] - prev_offset - 1, re2_st::RE2::UNANCHORED, nullptr, 0); else
{
size_t prev_offset = 0;
for (size_t i = 0; i < size; ++i)
{
res[i] = revert ^ regexp->getRE2()->Match(
re2_st::StringPiece(reinterpret_cast<const char *>(&data[prev_offset]), offsets[i] - prev_offset - 1),
0, offsets[i] - prev_offset - 1, re2_st::RE2::UNANCHORED, nullptr, 0);
prev_offset = offsets[i]; prev_offset = offsets[i];
}
} }
} }
else else

2
dbms/tests/queries/0_stateless/00144_empty_regexp.reference Normal file
View File

@ -0,0 +1,2 @@
1
1

2
dbms/tests/queries/0_stateless/00144_empty_regexp.sql Normal file
View File

@ -0,0 +1,2 @@
SELECT match(materialize('Hello'), '');
SELECT match('Hello', '');

16
dbms/tests/queries/0_stateless/00145_empty_likes.reference Normal file
View File

@ -0,0 +1,16 @@
0
1
1
1
1
0
1
1
0
1
1
1
1
0
1
1

18
dbms/tests/queries/0_stateless/00145_empty_likes.sql Normal file
View File

@ -0,0 +1,18 @@
SELECT materialize('Hello') LIKE '';
SELECT materialize('Hello') LIKE '%';
SELECT materialize('Hello') LIKE '%%';
SELECT materialize('Hello') LIKE '%%%';
SELECT materialize('Hello') LIKE '%_%';
SELECT materialize('Hello') LIKE '_';
SELECT materialize('Hello') LIKE '_%';
SELECT materialize('Hello') LIKE '%_';
SELECT 'Hello' LIKE '';
SELECT 'Hello' LIKE '%';
SELECT 'Hello' LIKE '%%';
SELECT 'Hello' LIKE '%%%';
SELECT 'Hello' LIKE '%_%';
SELECT 'Hello' LIKE '_';
SELECT 'Hello' LIKE '_%';
SELECT 'Hello' LIKE '%_';