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

MCOL-5346 This patch forces TreeNode::getIntValue to use conversion for dict-based CHAR/VARCHAR and TEXT columns (#2657)

Browse Source 
Co-authored-by: Roman Nozdrin <rnozdrin@mariadb.com>
This commit is contained in:
Roman Nozdrin
2022-12-13 18:13:22 +03:00
committed by GitHub
parent 635a9fdb56
commit d43e418a8c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dbcon/execplan/treenode.h
View File

@ -665,17 +665,25 @@ inline int64_t TreeNode::getIntVal()
switch (fResultType.colDataType) switch (fResultType.colDataType)
{ {
case CalpontSystemCatalog::CHAR: case CalpontSystemCatalog::CHAR:
{
if (fResultType.colWidth <= 8)
{
return fResult.intVal;
}
datatypes::DataCondition cnverr;
literal::Converter<literal::SignedInteger> cnv(fResult.strVal, cnverr);
return cnv.toSInt<int64_t>(cnverr);
}
case CalpontSystemCatalog::VARCHAR: case CalpontSystemCatalog::VARCHAR:
case CalpontSystemCatalog::VARBINARY: case CalpontSystemCatalog::VARBINARY:
case CalpontSystemCatalog::BLOB: case CalpontSystemCatalog::BLOB:
case CalpontSystemCatalog::TEXT: case CalpontSystemCatalog::TEXT:
{ {
if (fResultType.colWidth <= 7)
return fResult.intVal;
datatypes::DataCondition cnverr; datatypes::DataCondition cnverr;
literal::Converter<literal::SignedInteger> cnv(fResult.strVal, cnverr); literal::Converter<literal::SignedInteger> cnv(fResult.strVal, cnverr);
if (datatypes::DataCondition::Code(cnverr) != 0)
{
cerr << "error in int conversion from '" << fResult.strVal << "'";
}
return cnv.toSInt<int64_t>(cnverr); return cnv.toSInt<int64_t>(cnverr);
} }