1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00

tests and review fixes

This commit is contained in:
Leonid Fedorov
2024-03-07 12:52:56 +00:00
parent 5b54134ff0
commit 33b0fee5cd
10 changed files with 33 additions and 21 deletions

View File

@ -259,10 +259,11 @@ std::string Func_regexp_replace::getStrVal(rowgroup::Row& row, FunctionParm& fp,
execplan::CalpontSystemCatalog::ColType& ct)
{
RegExpParams param = getEpressionAndPattern(row, fp, isNull, ct, ct.getTimeZone());
if (isNull)
return std::string{};
RegExpParams param = getEpressionAndPattern(row, fp, isNull, ct, ct.getTimeZone());
const auto& replace_with = fp[2]->data()->getStrVal(row, isNull);
if (replace_with.isNull())
@ -280,11 +281,11 @@ std::string Func_regexp_substr::getStrVal(rowgroup::Row& row, FunctionParm& fp,
execplan::CalpontSystemCatalog::ColType& ct)
{
RegExpParams param = getEpressionAndPattern(row, fp, isNull, ct, ct.getTimeZone());
if (isNull)
return std::string{};
RegExpParams param = getEpressionAndPattern(row, fp, isNull, ct, ct.getTimeZone());
jp::Regex re(param.pattern);
jp::RegexMatch rm(&re);
jp::VecNum vec_num;
@ -305,11 +306,11 @@ std::string Func_regexp_instr::getStrVal(rowgroup::Row& row, FunctionParm& fp, b
execplan::CalpontSystemCatalog::ColType& ct)
{
RegExpParams param = getEpressionAndPattern(row, fp, isNull, ct, ct.getTimeZone());
if (isNull)
return std::string{};
RegExpParams param = getEpressionAndPattern(row, fp, isNull, ct, ct.getTimeZone());
jp::Regex re(param.pattern);
jp::RegexMatch rm(&re);
jpcre2::VecOff vec_soff;
@ -328,11 +329,11 @@ std::string Func_regexp_instr::getStrVal(rowgroup::Row& row, FunctionParm& fp, b
bool Func_regexp::getBoolVal(rowgroup::Row& row, FunctionParm& fp, bool& isNull,
CalpontSystemCatalog::ColType& ct)
{
RegExpParams param = getEpressionAndPattern(row, fp, isNull, ct, ct.getTimeZone());
if (isNull)
return false;
RegExpParams param = getEpressionAndPattern(row, fp, isNull, ct, ct.getTimeZone());
jp::Regex re(param.pattern);
return re.match(param.expression);
}