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

MCOL-1510 GROUP BY supports aggregates as arguments in string functions.

Browse Source
This commit is contained in:
Roman Nozdrin
2018-07-11 20:57:17 +03:00
parent 80fc93c9df
commit cc474f429c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbcon/mysql/ha_calpont_execplan.cpp
View File

@@ -2887,7 +2887,7 @@ ReturnedColumn* buildReturnedColumn(Item* item, gp_walk_info& gwi, bool& nonSupp
if (func_name == "+" || func_name == "-" || func_name == "*" || func_name == "/" ) if (func_name == "+" || func_name == "-" || func_name == "*" || func_name == "/" )
return buildArithmeticColumn(ifp, gwi, nonSupport, pushdownHand); return buildArithmeticColumn(ifp, gwi, nonSupport, pushdownHand);
else else
return buildFunctionColumn(ifp, gwi, nonSupport); return buildFunctionColumn(ifp, gwi, nonSupport, pushdownHand);
} }
case Item::SUM_FUNC_ITEM: case Item::SUM_FUNC_ITEM:
@@ -3410,7 +3410,7 @@ ReturnedColumn* buildFunctionColumn(
return NULL; return NULL;
} }
ReturnedColumn* rc = buildReturnedColumn(ifp->arguments()[i], gwi, nonSupport); ReturnedColumn* rc = buildReturnedColumn(ifp->arguments()[i], gwi, nonSupport, pushdownHand);
// MCOL-1510 It must be a temp table field, so find the corresponding column. // MCOL-1510 It must be a temp table field, so find the corresponding column.
if (pushdownHand if (pushdownHand
@@ -8861,7 +8861,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
redo = true; redo = true;
// @bug 1706 // @bug 1706
String funcStr; String funcStr;
ifp->print(&funcStr, QT_INFINIDB); //ifp->print(&funcStr, QT_INFINIDB);
gwi.selectCols.push_back(string(funcStr.c_ptr()) + " `" + escapeBackTick(ifp->name) + "`"); gwi.selectCols.push_back(string(funcStr.c_ptr()) + " `" + escapeBackTick(ifp->name) + "`");
// clear the error set by buildFunctionColumn // clear the error set by buildFunctionColumn
gwi.fatalParseError = false; gwi.fatalParseError = false;
@@ -9900,7 +9900,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
sel_query += ", "; sel_query += ", ";
} }
select_query.replace(lower_select_query.find("select *"), string("select *").length(), sel_query); //select_query.replace(lower_select_query.find("select *"), string("select *").length(), sel_query);
} }
else else
{ {