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

chore(ci): collect asan ubsan and libc++ build with mtr and regression status ignored (#3672)

Browse Source 
* MSan added with fixes for libc++

* libc++ sepatare build

* add libc++ to ci

* libstdc++ in CI

* libcpp and msan to external projects

* std::sqrt

* awful_hack(ci): install whole llvm instead of libc++ in terrible way for test containers

* Adding ddeb packages for teststages and repos

* libc++ more for test container

* save some money on debug

* colored coredumps

* revert ci

* chore(ci): collect asan ubsan and libc++ build with mtr and regression status ignored
This commit is contained in:
Leonid Fedorov
2025-07-31 00:32:32 +04:00
committed by GitHub
parent 2e2b4b3f82
commit 82421c208f
130 changed files with 715 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/funcexp/func_json_merge.cpp
View File

@@ -13,7 +13,7 @@ using namespace funcexp::helpers;
namespace
{
int doMerge(string& retJS, json_engine_t* jsEg1, json_engine_t* jsEg2)
int doMerge(std::string& retJS, json_engine_t* jsEg1, json_engine_t* jsEg2)
{
if (json_read_value(jsEg1) || json_read_value(jsEg2))
return 1;
@@ -214,8 +214,8 @@ CalpontSystemCatalog::ColType Func_json_merge::operationType(FunctionParm& fp,
return fp[0]->data()->resultType();
}
string Func_json_merge::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& isNull,
execplan::CalpontSystemCatalog::ColType& /*type*/)
std::string Func_json_merge::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& isNull,
execplan::CalpontSystemCatalog::ColType& /*type*/)
{
const auto js = fp[0]->data()->getStrVal(row, isNull);
if (isNull)
@@ -226,7 +226,7 @@ string Func_json_merge::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is
json_engine_t jsEg1, jsEg2;
utils::NullString tmpJS(js);
string retJS;
std::string retJS;
for (size_t i = 1; i < fp.size(); i++)
{