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

1. Fix for group_concat(distinct ... ) to use all unique values in a row.

Browse Source 
2. Explicitly set array bounds for Row::hash() and Row::equals().
This commit is contained in:
Gagan Goel
2019-08-15 01:15:05 -04:00
parent 4a4d35180a
commit 6ccdb4ac10
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/joblist/groupconcat.cpp
View File

@ -760,7 +760,7 @@ void GroupConcatOrderBy::initialize(const rowgroup::SP_GroupConcat& gcc)
uint64_t GroupConcatOrderBy::getKeyLength() const
{
// only distinct the concatenated columns
return fConcatColumns.size() - 1; // cols 0 to fConcatColumns will be conpared
return fConcatColumns.size(); // cols 0 to fConcatColumns.size() - 1 will be compared
}

2
dbcon/joblist/limitedorderby.cpp
View File

@ -91,7 +91,7 @@ void LimitedOrderBy::initialize(const RowGroup& rg, const JobInfo& jobInfo)
// not just a column count.
uint64_t LimitedOrderBy::getKeyLength() const
{
return fOrderByCond.size();
return fRow0.getColumnCount();
}

6
utils/windowfunction/idborderby.cpp
View File

@ -506,8 +506,8 @@ uint64_t IdbOrderBy::Hasher::operator()(const Row::Pointer& p) const
{
Row& row = ts->row1;
row.setPointer(p);
// MCOL-1829 Row::h uses colcount as an array idx down a callstack.
uint64_t ret = row.hash();
// MCOL-1829 Row::hash uses colcount - 1 as an array idx down a callstack.
uint64_t ret = row.hash(colCount - 1);
return ret;
}
@ -517,7 +517,7 @@ bool IdbOrderBy::Eq::operator()(const Row::Pointer& d1, const Row::Pointer& d2)
r1.setPointer(d1);
r2.setPointer(d2);
// MCOL-1829 Row::equals uses 2nd argument as key columns container size boundary
bool ret = r1.equals(r2, colCount);
bool ret = r1.equals(r2, colCount - 1);
return ret;
}