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

MCOL-3827 Optimize out sort on SubQuery in Select

Browse Source
This commit is contained in:
David Hall
2020-08-17 14:40:22 -05:00
parent 70f40210d0
commit e7b8abfdb9
2 changed files with 19 additions and 11 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());
uint64_t eid = rc->expressionId(); uint32_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

@ -7790,12 +7790,16 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
} }
} }
if (ordercol->direction == ORDER::ORDER_ASC) SimpleColumn* sc = dynamic_cast<SimpleColumn*>(rc);
rc->asc(true); if (!sc || sc->oid())
else {
rc->asc(false); if (ordercol->direction == ORDER::ORDER_ASC)
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
@ -9582,12 +9586,16 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
} }
} }
if (ordercol->direction == ORDER::ORDER_ASC) SimpleColumn* sc = dynamic_cast<SimpleColumn*>(rc);
rc->asc(true); if (!sc || sc->oid())
else {
rc->asc(false); if (ordercol->direction == ORDER::ORDER_ASC)
rc->asc(true);
else
rc->asc(false);
gwi.orderByCols.push_back(SRCP(rc)); gwi.orderByCols.push_back(SRCP(rc));
}
} }