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.
68 lines
1.5 KiB
C++
68 lines
1.5 KiB
C++
#include "functor_json.h"
|
|
#include "functioncolumn.h"
|
|
using namespace execplan;
|
|
|
|
#include "rowgroup.h"
|
|
using namespace rowgroup;
|
|
|
|
#include "dataconvert.h"
|
|
using namespace dataconvert;
|
|
|
|
#include "jsonhelpers.h"
|
|
using namespace funcexp::helpers;
|
|
|
|
namespace funcexp
|
|
{
|
|
CalpontSystemCatalog::ColType Func_json_depth::operationType(FunctionParm& fp,
|
|
CalpontSystemCatalog::ColType& resultType)
|
|
{
|
|
return fp[0]->data()->resultType();
|
|
}
|
|
|
|
int64_t Func_json_depth::getIntVal(rowgroup::Row& row, FunctionParm& fp, bool& isNull,
|
|
execplan::CalpontSystemCatalog::ColType& op_ct)
|
|
{
|
|
const auto js = fp[0]->data()->getStrVal(row, isNull);
|
|
if (isNull)
|
|
return 0;
|
|
|
|
int depth = 0, currDepth = 0;
|
|
bool incDepth = true;
|
|
|
|
json_engine_t jsEg;
|
|
initJSEngine(jsEg, getCharset(fp[0]), js);
|
|
|
|
do
|
|
{
|
|
switch (jsEg.state)
|
|
{
|
|
case JST_VALUE:
|
|
case JST_KEY:
|
|
if (incDepth)
|
|
{
|
|
currDepth++;
|
|
incDepth = false;
|
|
if (currDepth > depth)
|
|
depth = currDepth;
|
|
}
|
|
break;
|
|
case JST_OBJ_START:
|
|
case JST_ARRAY_START: incDepth = true; break;
|
|
case JST_OBJ_END:
|
|
case JST_ARRAY_END:
|
|
if (!incDepth)
|
|
currDepth--;
|
|
incDepth = false;
|
|
break;
|
|
default: break;
|
|
}
|
|
} while (json_scan_next(&jsEg) == 0);
|
|
|
|
if (likely(!jsEg.s.error))
|
|
return depth;
|
|
|
|
isNull = true;
|
|
return 0;
|
|
}
|
|
} // namespace funcexp
|