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 pull request #267 from mariadb-corporation/MCOL-895-1.1

Browse Source 
MCOL-895 Sort system catalog ridList
This commit is contained in:
David.Hall
2017-09-28 09:40:20 -05:00
committed by GitHub
parent 6b058cb60c 99d0027cc6
commit 2ce3acec1a
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -3093,18 +3093,35 @@ const CalpontSystemCatalog::RIDList CalpontSystemCatalog::columnRIDs(const Table
ctList[i].nextvalue = ((*it)->GetData(i));
}
}
// MCOL-895 sort ctList, we can't specify an ORDER BY to do this yet
std::sort(ctList, ctList + ti.numOfCols, ctListSort);
// populate colinfo cache
lk3.lock();
for (int i = 0; i < ti.numOfCols; i++)
fColinfomap[ctList[i].columnOID] = ctList[i];
lk3.unlock();
// Re-sort the output based on the sorted ctList
// Don't need to do this for the cached list as this will be already sorted
RIDList rlOut;
for (int i = 0; i < ti.numOfCols; i++)
{
OID objid = ctList[i].columnOID;
for (size_t j = 0; j < rl.size(); j++)
{
if (rl[j].objnum == objid)
{
rlOut.push_back(rl[j]);
}
}
}
delete [] ctList;
// delete col[9];
if (rl.size() != 0)
if (rlOut.size() != 0)
{
return rl;
return rlOut;
}
Message::Args args;
@ -5788,5 +5805,10 @@ vector<CalpontSystemCatalog::OID> getAllSysCatOIDs()
return ret;
}
bool ctListSort(const CalpontSystemCatalog::ColType& a, const CalpontSystemCatalog::ColType& b)
{
return a.colPosition < b.colPosition;
}
} // namespace execplan
// vim:sw=4 ts=4:

2
dbcon/execplan/calpontsystemcatalog.h
View File

@ -1247,6 +1247,8 @@ std::ostream& operator<<(std::ostream& os, const CalpontSystemCatalog::ColType&
const std::string colDataTypeToString(CalpontSystemCatalog::ColDataType cdt);
bool ctListSort(const CalpontSystemCatalog::ColType& a, const CalpontSystemCatalog::ColType& b);
} //namespace execplan
#endif //EXECPLAN_CALPONTSYSTEMCATALOG_H