database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-271 empty strings should not be NULLs (#2794)

Browse Source 
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.
This commit is contained in:
Sergey Zefirov
2023-03-30 17:26:45 +01:00
committed by Roman Nozdrin
parent 0ea592da80
commit b53c231ca6
417 changed files with 12459 additions and 3520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dbcon/execplan/constantcolumn.cpp
View File

@ -39,14 +39,14 @@ namespace execplan
/**
* Constructors/Destructors
*/
ConstantColumn::ConstantColumn() : ReturnedColumn(), fType(0)
ConstantColumn::ConstantColumn() : ReturnedColumn(), fType(NULLDATA)
{
}
ConstantColumn::ConstantColumn(const string& sql, TYPE type)
: ReturnedColumn(), fConstval(sql), fType(type), fData(sql)
{
fResult.strVal = sql;
fResult.strVal.assign(sql);
fResult.intVal = atoll(sql.c_str());
fResult.uintVal = strtoull(sql.c_str(), NULL, 0);
@ -81,7 +81,7 @@ ConstantColumn::ConstantColumn(const string& sql, TYPE type)
ConstantColumn::ConstantColumn(const string& sql, const double val)
: ReturnedColumn(), fConstval(sql), fType(NUM), fData(sql)
{
fResult.strVal = sql;
fResult.strVal.assign(sql);
fResult.doubleVal = val;
fResult.intVal = (int64_t)val;
fResult.uintVal = (uint64_t)val;
@ -96,7 +96,7 @@ ConstantColumn::ConstantColumn(const string& sql, const double val)
ConstantColumn::ConstantColumn(const string& sql, const long double val)
: ReturnedColumn(), fConstval(sql), fType(NUM), fData(sql)
{
fResult.strVal = sql;
fResult.strVal.assign(sql);
fResult.doubleVal = (double)val;
fResult.intVal = (int64_t)val;
fResult.uintVal = (uint64_t)val;
@ -111,7 +111,7 @@ ConstantColumn::ConstantColumn(const string& sql, const long double val)
ConstantColumn::ConstantColumn(const string& sql, const int64_t val, TYPE type)
: ReturnedColumn(), fConstval(sql), fType(type), fData(sql)
{
fResult.strVal = sql;
fResult.strVal.assign(sql);
fResult.intVal = val;
fResult.uintVal = (uint64_t)fResult.intVal;
fResult.floatVal = (float)fResult.intVal;
@ -125,7 +125,7 @@ ConstantColumn::ConstantColumn(const string& sql, const int64_t val, TYPE type)
ConstantColumn::ConstantColumn(const string& sql, const uint64_t val, TYPE type)
: ReturnedColumn(), fConstval(sql), fType(type), fData(sql)
{
fResult.strVal = sql;
fResult.strVal.assign(sql);
fResult.uintVal = val;
fResult.intVal = (int64_t)fResult.uintVal;
fResult.floatVal = (float)fResult.uintVal;
@ -139,7 +139,7 @@ ConstantColumn::ConstantColumn(const string& sql, const uint64_t val, TYPE type)
ConstantColumn::ConstantColumn(const string& sql, const IDB_Decimal& val)
: ReturnedColumn(), fConstval(sql), fType(NUM), fData(sql)
{
fResult.strVal = sql;
fResult.strVal.assign(sql);
fResult.intVal = (int64_t)atoll(sql.c_str());
fResult.uintVal = strtoull(sql.c_str(), NULL, 0);
fResult.floatVal = atof(sql.c_str());
@ -167,9 +167,9 @@ ConstantColumn::ConstantColumn(const int64_t val, TYPE type) : ReturnedColumn(),
{
ostringstream oss;
oss << val;
fConstval = oss.str();
fConstval.assign(oss.str());
fData = oss.str();
fResult.strVal = fData;
fResult.strVal.assign(fData);
fResult.intVal = val;
fResult.uintVal = (uint64_t)fResult.intVal;
fResult.floatVal = (float)fResult.intVal;
@ -185,9 +185,9 @@ ConstantColumn::ConstantColumn(const uint64_t val, TYPE type, int8_t scale, uint
{
ostringstream oss;
oss << val;
fConstval = oss.str();
fConstval.assign(oss.str());
fData = oss.str();
fResult.strVal = fData;
fResult.strVal.assign(fData);
fResult.intVal = (int64_t)val;
fResult.uintVal = val;
fResult.floatVal = (float)fResult.uintVal;
@ -205,7 +205,8 @@ ConstantColumn::~ConstantColumn()
const string ConstantColumn::toString() const
{
ostringstream oss;
oss << "ConstantColumn: " << fConstval << " intVal=" << fResult.intVal << " uintVal=" << fResult.uintVal;
oss << "ConstantColumn: " << fConstval.safeString("<<NuLL>>") << " intVal=" << fResult.intVal
<< " uintVal=" << fResult.uintVal;
oss << '(';
if (fType == LITERAL)
@ -228,7 +229,7 @@ std::string ConstantColumn::toCppCode(IncludeSet& includes) const
{
includes.insert("constantcolumn.h");
std::stringstream ss;
ss << "ConstantColumn(" << std::quoted(fData) << ", " << fConstval << ")";
ss << "ConstantColumn(" << std::quoted(fData) << ", " << fConstval.safeString() << ")";
return ss.str();
}
@ -305,7 +306,10 @@ bool ConstantColumn::operator==(const ConstantColumn& t) const
if (*rc1 != *rc2)
return false;
if (fConstval != t.fConstval)
if (fConstval.isNull() != t.fConstval.isNull())
return false;
if (!fConstval.isNull() && fConstval.unsafeStringRef() != t.fConstval.unsafeStringRef())
return false;
if (fType != t.fType)