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-641 Simple aggregates works with GROUP BY column keys.

Browse Source 
Fixed constant colump copy for binary columns in TNS.
This commit is contained in:
Roman Nozdrin
2020-05-08 15:57:23 +00:00
parent e88cbe9bc1
commit 21a41738e1
4 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dbcon/joblist/tupleconstantstep.cpp
View File

@ -512,31 +512,18 @@ void TupleConstantStep::fillInConstants(const rowgroup::Row& rowIn, rowgroup::Ro
if (fIndexConst.size() > 1 || fIndexConst[0] != 0)
{
copyRow(fRowConst, &rowOut);
//memcpy(rowOut.getData(), fRowConst.getData(), fRowConst.getSize());
rowOut.setRid(rowIn.getRelRid());
for (uint64_t j = 0; j < fIndexMapping.size(); ++j)
rowIn.copyField(rowOut, fIndexMapping[j], j);
//rowIn.copyField(rowOut.getData() + rowOut.getOffset(fIndexMapping[j]), j);
}
else // only first column is constant
{
//size_t n = rowOut.getOffset(rowOut.getColumnCount()) - rowOut.getOffset(1);
rowOut.setRid(rowIn.getRelRid());
fRowConst.copyField(rowOut, 0, 0);
//fRowConst.copyField(rowOut.getData()+2, 0); // hardcoded 2 for rid length
for (uint32_t i = 1; i < rowOut.getColumnCount(); i++)
// WIP MCOL-641 implement copyBinaryField inside copyField
if (UNLIKELY(utils::isWide(rowIn.getColumnWidth(i - 1)) &&
(rowIn.getColType(i - 1) == CalpontSystemCatalog::DECIMAL ||
rowIn.getColType(i - 1) == CalpontSystemCatalog::UDECIMAL)))
rowIn.copyBinaryField(rowOut, i, i - 1);
else
rowIn.copyField(rowOut, i, i - 1);
//memcpy(rowOut.getData()+rowOut.getOffset(1), rowIn.getData()+2, n);
rowIn.copyField(rowOut, i, i - 1);
}
}