database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-12-18 13:54:11 +03:00
Code Activity

Merge pull request #1389 from dhall-MariaDB/MCOL-3827

Browse Source 
MCOL-3827 optimize out sort of singleton
This commit is contained in:
Gagan Goel
2020-08-28 15:07:25 -04:00
committed by GitHub
parent 4f068870c9 9df66c4d3e
commit abcfffcc66
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dbcon/joblist/jlf_subquery.cpp
View File

@@ -819,11 +819,17 @@ void addOrderByAndLimit(CalpontSelectExecutionPlan* csep, JobInfo& jobInfo)
{ {
sc = dynamic_cast<SimpleColumn*>(jobInfo.deliveredCols[sc->orderPos()].get()); sc = dynamic_cast<SimpleColumn*>(jobInfo.deliveredCols[sc->orderPos()].get());
// TODO Investigate why this could be NULL // If sc is NULL it's most likely a scaler subquery
if (sc == NULL) if (sc == NULL)
{ {
const ReturnedColumn* rc = dynamic_cast<const ReturnedColumn*>(orderByCols[i].get()); const ReturnedColumn* rc = dynamic_cast<const ReturnedColumn*>(orderByCols[i].get());
uint64_t eid = rc->expressionId(); uint32_t eid = rc->expressionId();
// If eid is -1, then there's no corresponding
// entry in tupleKeyMap and it will assert down the line
// Don't add the order by. It won't work and ordering on
// a singleton is a waste anyway.
if ((int32_t)eid == -1)
continue;
CalpontSystemCatalog::ColType ct = rc->resultType(); CalpontSystemCatalog::ColType ct = rc->resultType();
tupleKey = getExpTupleKey(jobInfo, eid); tupleKey = getExpTupleKey(jobInfo, eid);
jobInfo.orderByColVec.push_back(make_pair(tupleKey, orderByCols[i]->asc())); jobInfo.orderByColVec.push_back(make_pair(tupleKey, orderByCols[i]->asc()));