1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00

Fix indentation

This commit is contained in:
Andrew Hutchings
2018-05-09 09:28:30 +01:00
parent 1a582eed4a
commit 1ac28c4f26

View File

@ -6912,13 +6912,6 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
algorithm::to_lower(lower_create_query); algorithm::to_lower(lower_create_query);
algorithm::to_lower(lower_select_query); algorithm::to_lower(lower_select_query);
// Group by list. not valid for union main query
if (gwi.thd->infinidb_vtable.vtable_state == THD::INFINIDB_CREATE_VTABLE && !unionSel)
{
gwi.clauseType = GROUP_BY;
Item* nonSupportItem = NULL;
ORDER* groupcol = reinterpret_cast<ORDER*>(select_lex.group_list.first);
// check if window functions are in order by. InfiniDB process order by list if // check if window functions are in order by. InfiniDB process order by list if
// window functions are involved, either in order by or projection. // window functions are involved, either in order by or projection.
for (; ordercol; ordercol = ordercol->next) for (; ordercol; ordercol = ordercol->next)
@ -7837,10 +7830,10 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
gwi.thd->infinidb_vtable.duplicate_field_name = false; gwi.thd->infinidb_vtable.duplicate_field_name = false;
clearStacks(gwi); clearStacks(gwi);
return 0; return 0;
} }
int cp_get_plan(THD * thd, SCSEP & csep) int cp_get_plan(THD* thd, SCSEP& csep)
{ {
LEX* lex = thd->lex; LEX* lex = thd->lex;
idbassert(lex != 0); idbassert(lex != 0);
@ -7858,10 +7851,10 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
derivedTableOptimization(csep); derivedTableOptimization(csep);
return 0; return 0;
} }
int cp_get_table_plan(THD * thd, SCSEP & csep, cal_table_info & ti) int cp_get_table_plan(THD* thd, SCSEP& csep, cal_table_info& ti)
{ {
gp_walk_info* gwi = ti.condInfo; gp_walk_info* gwi = ti.condInfo;
if (!gwi) if (!gwi)
@ -7954,10 +7947,10 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
csep->stringScanThreshold(gwi->thd->variables.infinidb_string_scan_threshold); csep->stringScanThreshold(gwi->thd->variables.infinidb_string_scan_threshold);
return 0; return 0;
} }
int cp_get_group_plan(THD * thd, SCSEP & csep, cal_impl_if::cal_group_info & gi) int cp_get_group_plan(THD* thd, SCSEP& csep, cal_impl_if::cal_group_info& gi)
{ {
LEX* lex = thd->lex; LEX* lex = thd->lex;
idbassert(lex != 0); idbassert(lex != 0);
@ -7972,10 +7965,10 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
return status; return status;
return 0; return 0;
} }
/*@brief buildConstColFromFilter- change SimpleColumn into ConstColumn*/ /*@brief buildConstColFromFilter- change SimpleColumn into ConstColumn*/
/*********************************************************** /***********************************************************
* DESCRIPTION: * DESCRIPTION:
* Server could optimize out fields from GROUP BY list, when certain * Server could optimize out fields from GROUP BY list, when certain
* filter predicate is used, e.g. * filter predicate is used, e.g.
@ -7989,9 +7982,9 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
* ConstantColumn* if originalSC equals with cond_pushed columns. * ConstantColumn* if originalSC equals with cond_pushed columns.
* NULL otherwise * NULL otherwise
***********************************************************/ ***********************************************************/
ConstantColumn* buildConstColFromFilter(SimpleColumn * originalSC, ConstantColumn* buildConstColFromFilter(SimpleColumn* originalSC,
gp_walk_info & gwi, cal_group_info & gi) gp_walk_info& gwi, cal_group_info& gi)
{ {
execplan::SimpleColumn* simpleCol; execplan::SimpleColumn* simpleCol;
execplan::ConstantColumn* constCol; execplan::ConstantColumn* constCol;
execplan::SOP op; execplan::SOP op;
@ -8028,10 +8021,10 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
} }
return result; return result;
} }
int getGroupPlan(gp_walk_info & gwi, SELECT_LEX & select_lex, SCSEP & csep, cal_group_info & gi, bool isUnion) int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_group_info& gi, bool isUnion)
{ {
#ifdef DEBUG_WALK_COND #ifdef DEBUG_WALK_COND
cerr << "getGroupPlan()" << endl; cerr << "getGroupPlan()" << endl;
#endif #endif
@ -9913,7 +9906,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
gwi.thd->infinidb_vtable.duplicate_field_name = false; gwi.thd->infinidb_vtable.duplicate_field_name = false;
clearStacks(gwi); clearStacks(gwi);
return 0; return 0;
} }
} }