database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-641 This commit cleans up Row methods and adds couple UT for Row.

Browse Source
This commit is contained in:
Roman Nozdrin
2020-02-20 22:28:38 +00:00
parent b07db9a8f4
commit de85e21c38
9 changed files with 196 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
utils/rowgroup/rowgroup.cpp
View File

@ -43,6 +43,7 @@ using namespace execplan;
#include "nullvaluemanip.h"
#include "rowgroup.h"
#include "dataconvert.h"
#include "columnwidth.h"
#include "collation.h"
@ -636,16 +637,17 @@ string Row::toString() const
break;
// WIP
case CalpontSystemCatalog::DECIMAL:
if (precision[i] > 18)
case CalpontSystemCatalog::UDECIMAL:
if (colWidths[i] > MAXLEGACYWIDTH)
{
char *buf = (char*)alloca(precision[i] + 3);
// empty the buffer
dataconvert::DataConvert::toString<uint128_t>(getBinaryField<uint128_t>(i),
dataconvert::DataConvert::toString<int128_t>(getBinaryField<int128_t>(i),
buf, precision[i]+3);
os << buf << " ";
break;
}
// fallback if the precision < 18
// fallback if the the legacy DECIMAL
default:
os << getIntField(i) << " ";
break;
@ -708,7 +710,8 @@ string Row::toCSV() const
break;
}
case CalpontSystemCatalog::BINARY:
std::cout << __FILE__<< __LINE__ << ":" << "toCSV"<< std::endl;
std::cout << __FILE__<< __LINE__ << ":" << "toCSV"<< std::endl;
default:
os << getIntField(i);
break;
@ -877,7 +880,13 @@ void Row::initToNull()
*((uint64_t*) &data[offsets[i]]) = joblist::UBIGINTNULL;
break;
case CalpontSystemCatalog::BINARY:
std::cout << __FILE__<< ":" <<__LINE__ << " Fix for 16 Bytes ?" << std::endl;
{
uint64_t *dec = reinterpret_cast<uint64_t*>(&data[offsets[i]]);
dec[0] = joblist::BINARYEMPTYROW;
dec[1] = joblist::BINARYNULL;
}
break;
default:
ostringstream os;
os << "Row::initToNull(): got bad column type (" << types[i] <<
@ -888,7 +897,7 @@ void Row::initToNull()
}
}
template<cscDataType cscDT, uint32_t width>
template<cscDataType cscDT, int width>
inline bool Row::isNullValue_offset(uint32_t offset) const
{
ostringstream os;
@ -1052,21 +1061,13 @@ bool Row::isNullValue(uint32_t colIndex) const
case CalpontSystemCatalog::UDECIMAL:
{
// WIP MCOL-641 Allmighty hack.
const uint32_t len = 16;
uint32_t* lenPtr = const_cast<uint32_t*>(&len);
*lenPtr = getColumnWidth(colIndex);
return isNullValue_offset
<execplan::CalpontSystemCatalog::DECIMAL,len>(offsets[colIndex]);
// WIP
/*
const int64_t *dec;
switch (len)
int32_t width = getColumnWidth(colIndex);
switch (width)
{
// MCOL-641
case 16:
return isNullValue_offset
<execplan::CalpontSystemCatalog::DECIMAL,len>(offsets[colIndex]);
<execplan::CalpontSystemCatalog::DECIMAL,16>(offsets[colIndex]);
case 1 :
return (data[offsets[colIndex]] == joblist::TINYINTNULL);
@ -1080,7 +1081,7 @@ bool Row::isNullValue(uint32_t colIndex) const
default:
return (*((int64_t*) &data[offsets[colIndex]]) == static_cast<int64_t>(joblist::BIGINTNULL));
}
*/
break;
}
@ -1647,7 +1648,7 @@ void applyMapping(const int* mapping, const Row& in, Row* out)
// code precision 2 width convertor
else if (UNLIKELY(in.getColTypes()[i] == execplan::CalpontSystemCatalog::DECIMAL &&
in.getColumnWidth(i) == 16))
out->setBinaryField(in.getBinaryField<uint8_t>(i), 16,
out->setBinaryField_offset(in.getBinaryField<uint8_t>(i), 16,
out->getOffset(mapping[i]));
else if (in.isUnsigned(i))
out->setUintField(in.getUintField(i), mapping[i]);