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

Revert "MCOL-3827 Optimize out sort on SubQuery in Select"

Browse Source
This commit is contained in:
Gagan Goel
2020-08-19 19:23:55 -04:00
committed by GitHub
parent fd0ef267b5
commit 03c50eabee
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/joblist/jlf_subquery.cpp
View File

@ -823,7 +823,7 @@ void addOrderByAndLimit(CalpontSelectExecutionPlan* csep, JobInfo& jobInfo)
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());
uint32_t eid = rc->expressionId(); uint64_t eid = rc->expressionId();
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()));

28
dbcon/mysql/ha_mcs_execplan.cpp
View File

@ -7791,16 +7791,12 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
} }
} }
SimpleColumn* sc = dynamic_cast<SimpleColumn*>(rc); if (ordercol->direction == ORDER::ORDER_ASC)
if (!sc || sc->oid()) rc->asc(true);
{ else
if (ordercol->direction == ORDER::ORDER_ASC) rc->asc(false);
rc->asc(true);
else
rc->asc(false);
gwi.orderByCols.push_back(SRCP(rc)); gwi.orderByCols.push_back(SRCP(rc));
}
} }
} }
// make sure columnmap, returnedcols and count(*) arg_list are not empty // make sure columnmap, returnedcols and count(*) arg_list are not empty
@ -9587,16 +9583,12 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
} }
} }
SimpleColumn* sc = dynamic_cast<SimpleColumn*>(rc); if (ordercol->direction == ORDER::ORDER_ASC)
if (!sc || sc->oid()) rc->asc(true);
{ else
if (ordercol->direction == ORDER::ORDER_ASC) rc->asc(false);
rc->asc(true);
else
rc->asc(false);
gwi.orderByCols.push_back(SRCP(rc)); gwi.orderByCols.push_back(SRCP(rc));
}
} }