mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-04-18 21:44:02 +03:00
b53c231ca6
This patch improves handling of NULLs in textual fields in ColumnStore. Previously empty strings were considered NULLs and it could be a problem if data scheme allows for empty strings. It was also one of major reasons of behavior difference between ColumnStore and other engines in MariaDB family. Also, this patch fixes some other bugs and incorrect behavior, for example, incorrect comparison for "column <= ''" which evaluates to constant True for all purposes before this patch.
118 lines
2.8 KiB
C++
118 lines
2.8 KiB
C++
#include "functor_json.h"
|
|
#include "functioncolumn.h"
|
|
#include "constantcolumn.h"
|
|
using namespace execplan;
|
|
|
|
#include "rowgroup.h"
|
|
using namespace rowgroup;
|
|
|
|
#include "joblisttypes.h"
|
|
using namespace joblist;
|
|
|
|
#include "jsonhelpers.h"
|
|
using namespace funcexp::helpers;
|
|
|
|
namespace funcexp
|
|
{
|
|
CalpontSystemCatalog::ColType Func_json_array_append::operationType(FunctionParm& fp,
|
|
CalpontSystemCatalog::ColType& resultType)
|
|
{
|
|
return fp[0]->data()->resultType();
|
|
}
|
|
|
|
string Func_json_array_append::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& isNull,
|
|
execplan::CalpontSystemCatalog::ColType& type)
|
|
{
|
|
const auto& js = fp[0]->data()->getStrVal(row, isNull);
|
|
if (isNull)
|
|
return "";
|
|
|
|
const CHARSET_INFO* cs = getCharset(fp[0]);
|
|
|
|
json_engine_t jsEg;
|
|
const uchar* arrEnd;
|
|
size_t strRestLen;
|
|
string retJS;
|
|
retJS.reserve(js.length() + padding);
|
|
|
|
initJSPaths(paths, fp, 1, 2);
|
|
|
|
utils::NullString tmpJS(js);
|
|
for (size_t i = 1, j = 0; i < fp.size(); i += 2, j++)
|
|
{
|
|
const char* rawJS = tmpJS.str();
|
|
const size_t jsLen = tmpJS.length();
|
|
JSONPath& path = paths[j];
|
|
|
|
if (!path.parsed && parseJSPath(path, row, fp[i], false))
|
|
goto error;
|
|
|
|
initJSEngine(jsEg, cs, tmpJS);
|
|
|
|
if (locateJSPath(jsEg, path))
|
|
goto error;
|
|
|
|
if (json_read_value(&jsEg))
|
|
goto error;
|
|
|
|
if (jsEg.value_type == JSON_VALUE_ARRAY)
|
|
{
|
|
int itemSize;
|
|
if (json_skip_level_and_count(&jsEg, &itemSize))
|
|
goto error;
|
|
|
|
arrEnd = jsEg.s.c_str - jsEg.sav_c_len;
|
|
strRestLen = jsLen - (arrEnd - (const uchar*)rawJS);
|
|
retJS.append(rawJS, arrEnd - (const uchar*)rawJS);
|
|
if (itemSize)
|
|
retJS.append(", ");
|
|
if (appendJSValue(retJS, cs, row, fp[i + 1]))
|
|
goto error;
|
|
|
|
retJS.append((const char*)arrEnd, strRestLen);
|
|
}
|
|
else
|
|
{
|
|
const uchar *start, *end;
|
|
|
|
/* Wrap as an array. */
|
|
retJS.append(rawJS, (const char*)jsEg.value_begin - rawJS);
|
|
start = jsEg.value_begin;
|
|
if (jsEg.value_type == JSON_VALUE_OBJECT)
|
|
{
|
|
if (json_skip_level(&jsEg))
|
|
goto error;
|
|
end = jsEg.s.c_str;
|
|
}
|
|
else
|
|
end = jsEg.value_end;
|
|
|
|
retJS.append("[");
|
|
retJS.append((const char*)start, end - start);
|
|
retJS.append(", ");
|
|
if (appendJSValue(retJS, cs, row, fp[i + 1]))
|
|
goto error;
|
|
retJS.append("]");
|
|
retJS.append((const char*)jsEg.s.c_str, rawJS + jsLen - (const char*)jsEg.s.c_str);
|
|
}
|
|
|
|
// tmpJS save the json string for next loop
|
|
tmpJS.assign(retJS);
|
|
retJS.clear();
|
|
}
|
|
|
|
initJSEngine(jsEg, cs, tmpJS);
|
|
retJS.clear();
|
|
if (doFormat(&jsEg, retJS, Func_json_format::LOOSE))
|
|
goto error;
|
|
|
|
isNull = false;
|
|
return retJS;
|
|
|
|
error:
|
|
isNull = true;
|
|
return "";
|
|
}
|
|
|
|
} // namespace funcexp
|