mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-04-23 07:05:36 +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.
62 lines
1.3 KiB
C++
62 lines
1.3 KiB
C++
#include <string_view>
|
|
using namespace std;
|
|
|
|
#include "functor_json.h"
|
|
#include "functioncolumn.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_format::operationType(FunctionParm& fp,
|
|
CalpontSystemCatalog::ColType& resultType)
|
|
{
|
|
return fp[0]->data()->resultType();
|
|
}
|
|
|
|
string Func_json_format::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& isNull,
|
|
execplan::CalpontSystemCatalog::ColType& type)
|
|
{
|
|
const auto& js = fp[0]->data()->getStrVal(row, isNull);
|
|
if (isNull)
|
|
return "";
|
|
|
|
int tabSize = 4;
|
|
|
|
if (fmt == DETAILED)
|
|
{
|
|
if (fp.size() > 1)
|
|
{
|
|
tabSize = fp[1]->data()->getIntVal(row, isNull);
|
|
if (isNull)
|
|
return "";
|
|
|
|
if (tabSize < 0)
|
|
tabSize = 0;
|
|
else if (tabSize > TAB_SIZE_LIMIT)
|
|
tabSize = TAB_SIZE_LIMIT;
|
|
}
|
|
}
|
|
|
|
json_engine_t jsEg;
|
|
initJSEngine(jsEg, getCharset(fp[0]), js);
|
|
string ret;
|
|
if (doFormat(&jsEg, ret, fmt, tabSize))
|
|
{
|
|
isNull = true;
|
|
return "";
|
|
}
|
|
|
|
isNull = false;
|
|
return ret;
|
|
}
|
|
} // namespace funcexp
|