database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

MCOL-597 stabilization

Browse Source
This commit is contained in:
David Hall
2017-03-13 13:20:57 -05:00
parent 12acd033fb
commit 3055964ddc
8 changed files with 415 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dbcon/mysql/ha_calpont_execplan.cpp
View File

@ -423,7 +423,7 @@ void debug_walk(const Item *item, void *arg)
char* item_name = item->name;
if (!item_name)
{
item_name = "<NULL>";
item_name = (char*)"<NULL>";
}
switch (isp->sum_func())
{
@ -1111,6 +1111,15 @@ bool buildRowColumnFilter(gp_walk_info* gwip, RowColumn* rhs, RowColumn* lhs, It
bool buildPredicateItem(Item_func* ifp, gp_walk_info* gwip)
{
boost::shared_ptr<Operator> sop(new PredicateOperator(ifp->func_name()));
if (ifp->functype() == Item_func::LIKE_FUNC)
{
// Starting with MariaDB 10.2, LIKE uses a negated flag instead of FUNC_NOT
// Further processing is done below as before for LIKE
if (((Item_func_like*)ifp)->negated)
{
sop->reverseOp();
}
}
if (!(gwip->thd->infinidb_vtable.cal_conn_info))
gwip->thd->infinidb_vtable.cal_conn_info = (void*)(new cal_connection_info());
cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(gwip->thd->infinidb_vtable.cal_conn_info);
@ -6035,7 +6044,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
ostringstream oss;
oss << ordercol->counter;
ord_cols += oss.str();
if (!ordercol->direction == ORDER::ORDER_ASC)
if (ordercol->direction != ORDER::ORDER_ASC)
ord_cols += " desc";
continue;
}
@ -6160,7 +6169,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
gwi.returnedCols.push_back(srcp);
ord_cols += " `" + escapeBackTick(str.c_ptr()) + "`";
}
if (!ordercol->direction == ORDER::ORDER_ASC)
if (ordercol->direction != ORDER::ORDER_ASC)
ord_cols += " desc";
continue;
}
@ -6224,7 +6233,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
ord_item->print(&str, QT_INFINIDB);
ord_cols += str.c_ptr();
}
if (!ordercol->direction == ORDER::ORDER_ASC)
if (ordercol->direction != ORDER::ORDER_ASC)
ord_cols += " desc";
}
}
@ -6564,7 +6573,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
ord_item->print(&str, QT_INFINIDB_NO_QUOTE);
ord_cols += string(str.c_ptr());
}
if (!ordercol->direction == ORDER::ORDER_ASC)
if (ordercol->direction != ORDER::ORDER_ASC)
ord_cols += " desc";
}
}