database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

extra string copy eliminanated

Browse Source
This commit is contained in:
Leonid Fedorov
2024-03-12 15:39:17 +00:00
parent 0bc917a9d2
commit c024bb0be5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
utils/funcexp/func_regexp.cpp
View File

@ -323,16 +323,16 @@ std::string Func_regexp_replace::getStrVal(rowgroup::Row& row, FunctionParm& fp,
return param.expression; return param.expression;
PCREOptions options(ct); PCREOptions options(ct);
param.CharsetFix(options);
jp::Regex re(param.pattern, options.flags);
auto replaceWithStr = replaceWith.unsafeStringRef(); const auto& replaceWithStr = replaceWith.unsafeStringRef();
if (options.conversionIsNeeded) if (options.conversionIsNeeded)
{ {
replaceWithStr = csConvert(replaceWithStr, options.libraryCharset, options.dataCharset); const auto& convertedReplaceToken = csConvert(replaceWithStr, options.libraryCharset, options.dataCharset);
return re.replace(param.expression, convertedReplaceToken, "g");
} }
param.CharsetFix(options);
jp::Regex re(param.pattern, options.flags);
return re.replace(param.expression, replaceWithStr, "g"); return re.replace(param.expression, replaceWithStr, "g");
} }