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

MCOL-1829 Subquery with limited order by could potentially return onordered set.

Browse Source 
There were two code mistakes: Eq::operator() always returned true for
	any pair and Hasher::operator() always returned 0 as a key.
This commit is contained in:
Roman Nozdrin
2018-12-25 12:50:18 +03:00
parent 0584b114da
commit 35a17a87c4
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
utils/rowgroup/rowgroup.h
View File

@@ -1183,6 +1183,7 @@ inline bool Row::equals(const Row& r2, const std::vector<uint32_t>& keyCols) con
inline bool Row::equals(const Row& r2, uint32_t lastCol) const
{
// This check fires with empty r2 only.
if (lastCol >= columnCount)
return true;

7
utils/windowfunction/idborderby.cpp
View File

@@ -461,7 +461,8 @@ uint64_t IdbOrderBy::Hasher::operator()(const Row::Pointer& p) const
{
Row& row = ts->row1;
row.setPointer(p);
uint64_t ret = row.hash(colCount);
// MCOL-1829 Row::h uses colcount as an array idx down a callstack.
uint64_t ret = row.hash();//(colCount - 1);
//cout << "hash(): returning " << ret << " for row: " << row.toString() << endl;
return ret;
}
@@ -471,7 +472,9 @@ bool IdbOrderBy::Eq::operator()(const Row::Pointer& d1, const Row::Pointer& d2)
Row& r1 = ts->row1, &r2 = ts->row2;
r1.setPointer(d1);
r2.setPointer(d2);
bool ret = r1.equals(r2, colCount);
// MCOL-1829 Row::equals uses 2nd argument as container size boundary
// so it must be column count - 1.
bool ret = r1.equals(r2, colCount - 1);
//cout << "equals(): returning " << (int) ret << " for r1: " << r1.toString() << " r2: " << r2.toString()
// << endl;