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

Merge branch 'develop-1.1' into 1.2-merge-up-20190122

Browse Source
This commit is contained in:
Andrew Hutchings
2019-01-22 08:26:26 +00:00
parent 83b2d4c1fc d87b9a6084
commit 95c4f17b0a
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/joblist/joblist.cpp
View File

@ -1156,11 +1156,7 @@ void JobList::abort()
for (i = 0; i < fProject.size(); i++) for (i = 0; i < fProject.size(); i++)
fProject[i]->abort(); fProject[i]->abort();
for (i = 0; i < fQuery.size(); i++)
fQuery[i]->join();
for (i = 0; i < fProject.size(); i++)
fProject[i]->join();
} }
} }

3
dbcon/joblist/limitedorderby.cpp
View File

@ -147,12 +147,11 @@ void LimitedOrderBy::processRow(const rowgroup::Row& row)
{ {
OrderByRow swapRow = fOrderByQueue.top(); OrderByRow swapRow = fOrderByQueue.top();
row1.setData(swapRow.fData); row1.setData(swapRow.fData);
copyRow(row, &row1); copyRow(row, &row1);
if (fDistinct) if (fDistinct)
{ {
fDistinctMap->erase(fOrderByQueue.top().fData); fDistinctMap->erase(fOrderByQueue.top().fData);
fDistinctMap->insert(row1.getPointer()); fDistinctMap->insert(row1.getPointer());
} }

2
dbcon/mysql/is_columnstore_files.cpp
View File

@ -114,7 +114,7 @@ static int generate_result(BRM::OID_t oid, BRM::DBRM* emp, TABLE* table, THD* th
if (iter->blockOffset > 0) if (iter->blockOffset > 0)
{ {
iter++; iter++;
return 0; continue;
} }
try try

2
utils/windowfunction/idborderby.cpp
View File

@ -462,7 +462,7 @@ uint64_t IdbOrderBy::Hasher::operator()(const Row::Pointer& p) const
Row& row = ts->row1; Row& row = ts->row1;
row.setPointer(p); row.setPointer(p);
// MCOL-1829 Row::h uses colcount as an array idx down a callstack. // MCOL-1829 Row::h uses colcount as an array idx down a callstack.
uint64_t ret = row.hash();//(colCount - 1); uint64_t ret = row.hash();
//cout << "hash(): returning " << ret << " for row: " << row.toString() << endl; //cout << "hash(): returning " << ret << " for row: " << row.toString() << endl;
return ret; return ret;
} }