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

Fixed coding style. Changed extractAll behaviour [#CONV-8285]

Browse Source 
Now extractAll works without overcrossing.
New version:
#extractAll('abba', 'abbabba)
>['abba']

Old one:
#extractAll('abba', 'abbabba)
>['abba', 'abba']
This commit is contained in:
Pavel Kartavyy 2013-08-05 08:40:56 +00:00
parent 8c6edb5a7b
commit 8d857bd434
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,7 +217,7 @@ public:
}
};
class ExtractAll
class ExtractAllImpl
{
private:
const OptimizedRegularExpression *re;
@ -227,7 +227,7 @@ private:
Pos pos;
Pos end;
public:
ExtractAll():re(0) { matches.reserve(10); }
ExtractAllImpl():re(NULL) { }
/// Получить имя функции.
static String getName() { return "extractAll"; }
@ -249,7 +249,7 @@ public:
re = &Regexps::get(col->getData());
capture = re->getNumberOfSubpatterns() > 0 ? 1 : 0;
matches.reserve(capture + 1);
matches.resize(capture + 1);
}
/// Вызывается для каждой следующей строки.
@ -262,17 +262,16 @@ public:
/// Получить следующий токен, если есть, или вернуть false.
bool get(Pos & token_begin, Pos & token_end)
{
if(!pos || pos > end)
if (!pos || pos > end)
return false;
size_t match_num = re->match(pos, end - pos, matches);
if(!match_num)
if (!re->match(pos, end - pos, matches))
return false;
token_begin = pos + matches[match_num -1].offset;
token_end = token_begin + matches[match_num - 1].length;
token_begin = pos + matches[capture].offset;
token_end = token_begin + matches[capture].length;
pos += matches[0].offset + 1;
pos += matches[capture].offset + matches[capture].length;
return true;
}
@ -382,6 +381,6 @@ public:
typedef FunctionTokens<AlphaTokensImpl> FunctionAlphaTokens;
typedef FunctionTokens<SplitByCharImpl> FunctionSplitByChar;
typedef FunctionTokens<SplitByStringImpl> FunctionSplitByString;
typedef FunctionTokens<ExtractAll> FunctionExtractAll;
typedef FunctionTokens<ExtractAllImpl> FunctionExtractAll;
}

14
dbms/include/DB/Functions/FunctionsURL.h
View File

@ -43,7 +43,7 @@ namespace DB
* extractURLParameters(URL)
*
* Извлечь все имена параметров из URL в виде массива строк
* extractURLParametersNames(URL)
* extractURLParameterNames(URL)
*
* Убрать указанный параметр из URL.
* cutURLParameter(URL, name)
@ -511,19 +511,19 @@ public:
{
first = false;
pos = strchr(pos, '?');
}else{
pos = strchr(pos, '&');
}
else
pos = strchr(pos, '&');
if (pos == NULL)
return false;
return false;
++pos;
token_begin = pos;
pos = strpbrk(pos, "=&;#");
pos = strchr(pos, '=');
if (pos == NULL)
token_end = end;
return false;
else
token_end = pos++;