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-2178 Introduced a dummy replacement for a infinidb_table.

Browse Source 
Used Item attribute getters introduced by 10.4

    Make changes to support Item::CONST_ITEM introduced by 10.4
    as a replacement for INT_,REAL_,STRING_ ITEM.

    Replaced QT_INFINIDB_DERIVED and similar flags
    with correponded flags for Item->print().

    Replaced or commented out infinidb_ variable names with columnstore_
    where applicable.
This commit is contained in:
Roman Nozdrin
2019-02-25 18:42:56 +03:00
committed by Gagan Goel
parent 6fd5b2f22d
commit cd72326c4d
8 changed files with 542 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dbcon/mysql/ha_calpont.cpp
View File

@ -23,6 +23,8 @@
#include "ha_calpont_impl.h" #include "ha_calpont_impl.h"
#include "ha_mcs_pushdown.h" #include "ha_mcs_pushdown.h"
MIGR::INFINIDB_VTABLE MIGR::infinidb_vtable;
static handler* calpont_create_handler(handlerton* hton, static handler* calpont_create_handler(handlerton* hton,
TABLE_SHARE* table, TABLE_SHARE* table,
MEM_ROOT* mem_root); MEM_ROOT* mem_root);
@ -116,6 +118,7 @@ static int columnstore_init_func(void* p)
struct tm tm; struct tm tm;
time_t t; time_t t;
time(&t); time(&t);
localtime_r(&t, &tm); localtime_r(&t, &tm);
fprintf(stderr, "%02d%02d%02d %2d:%02d:%02d ", fprintf(stderr, "%02d%02d%02d %2d:%02d:%02d ",

4
dbcon/mysql/ha_calpont_dml.cpp
View File

@ -2117,8 +2117,8 @@ int ha_calpont_impl_commit_ (handlerton* hton, THD* thd, bool all, cal_connectio
{ {
int rc = 0; int rc = 0;
if (MIGR::infinidb_vtable.vtable_state == THD::INFINIDB_ALTER_VTABLE || if (MIGR::infinidb_vtable.vtable_state == MIGR::INFINIDB_ALTER_VTABLE ||
MIGR::infinidb_vtable.vtable_state == THD::INFINIDB_SELECT_VTABLE ) MIGR::infinidb_vtable.vtable_state == MIGR::INFINIDB_SELECT_VTABLE )
return rc; return rc;
if (thd->slave_thread && !ci.replicationEnabled) if (thd->slave_thread && !ci.replicationEnabled)

380
dbcon/mysql/ha_calpont_execplan.cpp
View File

@ -514,7 +514,7 @@ void debug_walk(const Item* item, void* arg)
case Item_func::BETWEEN: case Item_func::BETWEEN:
inp = (Item_func_opt_neg*)ifp; inp = (Item_func_opt_neg*)ifp;
if (inp->negated) cerr << "not "; if (inp->get_negated()) cerr << "not ";
cerr << "between" << " (" << ifp->functype() << ")" << endl; cerr << "between" << " (" << ifp->functype() << ")" << endl;
break; break;
@ -1584,7 +1584,7 @@ bool buildPredicateItem(Item_func* ifp, gp_walk_info* gwip)
{ {
// Starting with MariaDB 10.2, LIKE uses a negated flag instead of FUNC_NOT // Starting with MariaDB 10.2, LIKE uses a negated flag instead of FUNC_NOT
// Further processing is done below as before for LIKE // Further processing is done below as before for LIKE
if (((Item_func_like*)ifp)->negated) if (((Item_func_like*)ifp)->get_negated())
{ {
sop->reverseOp(); sop->reverseOp();
} }
@ -1722,7 +1722,7 @@ bool buildPredicateItem(Item_func* ifp, gp_walk_info* gwip)
String str; String str;
// @bug5811. This filter string is for cross engine to use. // @bug5811. This filter string is for cross engine to use.
// Use real table name. // Use real table name.
ifp->print(&str, QT_INFINIDB_DERIVED); ifp->print(&str, QT_ORDINARY);
IDEBUG(cerr << str.ptr() << endl); IDEBUG(cerr << str.ptr() << endl);
if (str.ptr()) if (str.ptr())
@ -2743,7 +2743,7 @@ uint32_t setAggOp(AggregateColumn* ac, Item_sum* isp)
{ {
Item_func_group_concat* gc = (Item_func_group_concat*)isp; Item_func_group_concat* gc = (Item_func_group_concat*)isp;
ac->aggOp(AggregateColumn::GROUP_CONCAT); ac->aggOp(AggregateColumn::GROUP_CONCAT);
ac->distinct(gc->isDistinct()); ac->distinct(gc->get_distinct());
return rc; return rc;
} }
@ -3021,7 +3021,7 @@ ReturnedColumn* buildReturnedColumn(Item* item, gp_walk_info& gwi, bool& nonSupp
{ {
//if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI )) //if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ))
{ {
if ( !item->fixed) if ( !item->is_fixed())
{ {
item->fix_fields(gwi.thd, (Item**)&item); item->fix_fields(gwi.thd, (Item**)&item);
} }
@ -3035,9 +3035,11 @@ ReturnedColumn* buildReturnedColumn(Item* item, gp_walk_info& gwi, bool& nonSupp
Item_field* ifp = (Item_field*)item; Item_field* ifp = (Item_field*)item;
return buildSimpleColumn(ifp, gwi); return buildSimpleColumn(ifp, gwi);
} }
case Item::CONST_ITEM:
case Item::INT_ITEM: {
case Item::VARBIN_ITEM: switch (item->cmp_type())
{
case INT_RESULT:
{ {
String val, *str = item->val_str(&val); String val, *str = item->val_str(&val);
string valStr; string valStr;
@ -3045,49 +3047,59 @@ ReturnedColumn* buildReturnedColumn(Item* item, gp_walk_info& gwi, bool& nonSupp
if (item->unsigned_flag) if (item->unsigned_flag)
{ {
//cc = new ConstantColumn(valStr, (uint64_t)item->val_uint(), ConstantColumn::NUM);
// It seems that str at this point is crap if val_uint() is > MAX_BIGINT. By using
// this constructor, ConstantColumn is built with the proper string. For whatever reason,
// ExeMgr converts the fConstval member to numeric, rather than using the existing numeric
// values available, so it's important to have fConstval correct.
rc = new ConstantColumn((uint64_t)item->val_uint(), ConstantColumn::NUM); rc = new ConstantColumn((uint64_t)item->val_uint(), ConstantColumn::NUM);
} }
else else
{ {
rc = new ConstantColumn(valStr, (int64_t)item->val_int(), ConstantColumn::NUM); rc = new ConstantColumn(valStr, (int64_t)item->val_int(), ConstantColumn::NUM);
} }
(dynamic_cast<ConstantColumn*>(rc))->timeZone(gwi.thd->variables.time_zone->get_name()->ptr());
//return cc;
break; break;
} }
case STRING_RESULT:
case Item::STRING_ITEM:
{ {
String val, *str = item->val_str(&val); String val, *str = item->val_str(&val);
string valStr; string valStr;
valStr.assign(str->ptr(), str->length()); valStr.assign(str->ptr(), str->length());
rc = new ConstantColumn(valStr); rc = new ConstantColumn(valStr);
(dynamic_cast<ConstantColumn*>(rc))->timeZone(gwi.thd->variables.time_zone->get_name()->ptr());
break; break;
} }
case REAL_RESULT:
case Item::REAL_ITEM:
{ {
String val, *str = item->val_str(&val); String val, *str = item->val_str(&val);
string valStr; string valStr;
valStr.assign(str->ptr(), str->length()); valStr.assign(str->ptr(), str->length());
rc = new ConstantColumn(valStr, item->val_real()); rc = new ConstantColumn(valStr, item->val_real());
(dynamic_cast<ConstantColumn*>(rc))->timeZone(gwi.thd->variables.time_zone->get_name()->ptr());
break; break;
} }
case DECIMAL_RESULT:
case Item::DECIMAL_ITEM:
{ {
rc = buildDecimalColumn(item, gwi); rc = buildDecimalColumn(item, gwi);
break; break;
} }
case TIME_RESULT:
{
String val, *str = item->val_str(&val);
string valStr;
valStr.assign(str->ptr(), str->length());
rc = new ConstantColumn(valStr);
break;
}
default:
{
gwi.fatalParseError = true;
gwi.parseErrorText = "Unknown item type";
break;
}
}
if (rc && (item->cmp_type() != DECIMAL_RESULT))
{
(dynamic_cast<ConstantColumn*>(rc))->timeZone(gwi.thd->variables.time_zone->get_name()->ptr());
}
break;
}
case Item::FUNC_ITEM: case Item::FUNC_ITEM:
{ {
Item_func* ifp = (Item_func*)item; Item_func* ifp = (Item_func*)item;
@ -3221,16 +3233,6 @@ ReturnedColumn* buildReturnedColumn(Item* item, gp_walk_info& gwi, bool& nonSupp
break; break;
} }
case Item::DATE_ITEM:
{
String val, *str = item->val_str(&val);
string valStr;
valStr.assign(str->ptr(), str->length());
rc = new ConstantColumn(valStr);
(dynamic_cast<ConstantColumn*>(rc))->timeZone(gwi.thd->variables.time_zone->get_name()->ptr());
break;
}
case Item::WINDOW_FUNC_ITEM: case Item::WINDOW_FUNC_ITEM:
{ {
return buildWindowFunctionColumn(item, gwi, nonSupport); return buildWindowFunctionColumn(item, gwi, nonSupport);
@ -3587,11 +3589,16 @@ ReturnedColumn* buildFunctionColumn(
for (uint32_t i = 1; i < ifp->argument_count(); i++) for (uint32_t i = 1; i < ifp->argument_count(); i++)
{ {
if (!(ifp->arguments()[i]->type() == Item::INT_ITEM || if (!(ifp->arguments()[i]->type() == Item::NULL_ITEM ||
ifp->arguments()[i]->type() == Item::STRING_ITEM || (ifp->arguments()[i]->type() == Item::CONST_ITEM &&
ifp->arguments()[i]->type() == Item::REAL_ITEM || (ifp->arguments()[i]->cmp_type() == INT_RESULT ||
ifp->arguments()[i]->type() == Item::DECIMAL_ITEM || ifp->arguments()[i]->cmp_type() == STRING_RESULT ||
ifp->arguments()[i]->type() == Item::NULL_ITEM)) ifp->arguments()[i]->cmp_type() == REAL_RESULT ||
ifp->arguments()[i]->cmp_type() == DECIMAL_RESULT
)
)
)
)
{ {
if (ifp->arguments()[i]->type() == Item::FUNC_ITEM) if (ifp->arguments()[i]->type() == Item::FUNC_ITEM)
{ {
@ -4464,7 +4471,7 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
RowColumn* rowCol = new RowColumn(); RowColumn* rowCol = new RowColumn();
vector<SRCP> selCols; vector<SRCP> selCols;
uint32_t select_ctn = gc->count_field(); uint32_t select_ctn = gc->get_count_field();
ReturnedColumn* rc = NULL; ReturnedColumn* rc = NULL;
for (uint32_t i = 0; i < select_ctn; i++) for (uint32_t i = 0; i < select_ctn; i++)
@ -4485,12 +4492,13 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
ORDER** order_item, **end; ORDER** order_item, **end;
for (order_item = gc->get_order(), for (order_item = gc->get_order(),
end = order_item + gc->order_field(); order_item < end; end = order_item + gc->get_order_field(); order_item < end;
order_item++) order_item++)
{ {
Item* ord_col = *(*order_item)->item; Item* ord_col = *(*order_item)->item;
if (ord_col->type() == Item::INT_ITEM) if (ord_col->type() == Item::CONST_ITEM
&& ord_col->cmp_type() == INT_RESULT)
{ {
Item_int* id = (Item_int*)ord_col; Item_int* id = (Item_int*)ord_col;
@ -4530,10 +4538,10 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
parm.reset(rowCol); parm.reset(rowCol);
ac->aggParms().push_back(parm); ac->aggParms().push_back(parm);
if (gc->str_separator()) if (gc->get_separator())
{ {
string separator; string separator;
separator.assign(gc->str_separator()->ptr(), gc->str_separator()->length()); separator.assign(gc->get_separator()->ptr(), gc->get_separator()->length());
(dynamic_cast<GroupConcatColumn*>(ac))->separator(separator); (dynamic_cast<GroupConcatColumn*>(ac))->separator(separator);
} }
} }
@ -4564,10 +4572,14 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
break; break;
} }
case Item::INT_ITEM: case Item::CONST_ITEM:
case Item::STRING_ITEM: {
case Item::REAL_ITEM: switch(sfitemp->cmp_type())
case Item::DECIMAL_ITEM: {
case INT_RESULT:
case STRING_RESULT:
case REAL_RESULT:
case DECIMAL_RESULT:
{ {
// treat as count(*) // treat as count(*)
if (ac->aggOp() == AggregateColumn::COUNT) if (ac->aggOp() == AggregateColumn::COUNT)
@ -4578,6 +4590,13 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
bIsConst = true; bIsConst = true;
break; break;
} }
default:
{
gwi.fatalParseError = true;
}
}
break;
}
case Item::NULL_ITEM: case Item::NULL_ITEM:
{ {
@ -4659,7 +4678,6 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
default: default:
{ {
gwi.fatalParseError = true; gwi.fatalParseError = true;
//gwi.parseErrorText = "Non-supported Item in Aggregate function";
} }
} }
@ -4922,7 +4940,7 @@ void addIntervalArgs(THD* thd, Item_func* ifp, FunctionParm& functionParms)
if (funcName == "date_add_interval") if (funcName == "date_add_interval")
interval_type = ((Item_date_add_interval*)ifp)->int_type; interval_type = ((Item_date_add_interval*)ifp)->int_type;
else if (funcName == "timestampdiff") else if (funcName == "timestampdiff")
interval_type = ((Item_func_timestamp_diff*)ifp)->int_type; interval_type = ((Item_func_timestamp_diff*)ifp)->get_int_type();
else if (funcName == "extract") else if (funcName == "extract")
interval_type = ((Item_extract*)ifp)->int_type; interval_type = ((Item_extract*)ifp)->int_type;
@ -4959,7 +4977,7 @@ void castCharArgs(THD* thd, Item_func* ifp, FunctionParm& functionParms)
Item_char_typecast* idai = (Item_char_typecast*)ifp; Item_char_typecast* idai = (Item_char_typecast*)ifp;
SPTP sptp; SPTP sptp;
sptp.reset(new ParseTree(new ConstantColumn((int64_t)idai->castLength()))); sptp.reset(new ParseTree(new ConstantColumn((int64_t)idai->get_cast_length())));
(dynamic_cast<ConstantColumn*>(sptp->data()))->timeZone(thd->variables.time_zone->get_name()->ptr()); (dynamic_cast<ConstantColumn*>(sptp->data()))->timeZone(thd->variables.time_zone->get_name()->ptr());
functionParms.push_back(sptp); functionParms.push_back(sptp);
} }
@ -5058,14 +5076,18 @@ void gp_walk(const Item* item, void* arg)
break; break;
} }
case Item::INT_ITEM: case Item::CONST_ITEM:
{
switch(item->cmp_type())
{
case INT_RESULT:
{ {
Item_int* iip = (Item_int*)item; Item_int* iip = (Item_int*)item;
gwip->rcWorkStack.push(buildReturnedColumn(iip, *gwip, gwip->fatalParseError)); gwip->rcWorkStack.push(buildReturnedColumn(iip, *gwip, gwip->fatalParseError));
break; break;
} }
case Item::STRING_ITEM: case STRING_RESULT:
{ {
Item_string* isp = (Item_string*)item; Item_string* isp = (Item_string*)item;
@ -5088,37 +5110,62 @@ void gp_walk(const Item* item, void* arg)
gwip->rcWorkStack.push(buildReturnedColumn(isp, *gwip, gwip->fatalParseError)); gwip->rcWorkStack.push(buildReturnedColumn(isp, *gwip, gwip->fatalParseError));
} }
break; break;
} }
case Item::REAL_ITEM: case REAL_RESULT:
{ {
Item_float* ifp = (Item_float*)item; Item_float* ifp = (Item_float*)item;
gwip->rcWorkStack.push(buildReturnedColumn(ifp, *gwip, gwip->fatalParseError)); gwip->rcWorkStack.push(buildReturnedColumn(ifp, *gwip, gwip->fatalParseError));
break; break;
} }
case Item::DECIMAL_ITEM: case DECIMAL_RESULT:
{ {
Item_decimal* idp = (Item_decimal*)item; Item_decimal* idp = (Item_decimal*)item;
gwip->rcWorkStack.push(buildReturnedColumn(idp, *gwip, gwip->fatalParseError)); gwip->rcWorkStack.push(buildReturnedColumn(idp, *gwip, gwip->fatalParseError));
break; break;
} }
case Item::VARBIN_ITEM: case TIME_RESULT:
{
Item_temporal_literal* itp = (Item_temporal_literal*)item;
gwip->rcWorkStack.push(buildReturnedColumn(itp, *gwip, gwip->fatalParseError));
break;
}
/*case Item::VARBIN_ITEM:
{ {
Item_hex_string* hdp = (Item_hex_string*)item; Item_hex_string* hdp = (Item_hex_string*)item;
gwip->rcWorkStack.push(buildReturnedColumn(hdp, *gwip, gwip->fatalParseError)); gwip->rcWorkStack.push(buildReturnedColumn(hdp, *gwip, gwip->fatalParseError));
break; break;
}*/
default:
{
if (gwip->condPush)
{
// push noop for unhandled item
SimpleColumn* rc = new SimpleColumn("noop");
rc->timeZone(gwip->thd->variables.time_zone->get_name()->ptr());
gwip->rcWorkStack.push(rc);
break;
} }
ostringstream oss;
oss << "Unhandled Item type: " << item->type();
gwip->parseErrorText = oss.str();
gwip->fatalParseError = true;
break;
}
}
break;
}
case Item::NULL_ITEM: case Item::NULL_ITEM:
{ {
if (gwip->condPush) if (gwip->condPush)
{ {
// push noop for unhandled item // push noop for unhandled item
SimpleColumn* rc = new SimpleColumn("noop"); SimpleColumn* rc = new SimpleColumn("noop");
rc->timeZone(gwip->thd->variables.time_zone->get_name()->ptr());
gwip->rcWorkStack.push(rc); gwip->rcWorkStack.push(rc);
break; break;
} }
@ -5356,10 +5403,13 @@ void gp_walk(const Item* item, void* arg)
} }
if ((it->type() == Item::FIELD_ITEM if ((it->type() == Item::FIELD_ITEM
|| it->type() == Item::INT_ITEM || ( it->type() == Item::CONST_ITEM
|| it->type() == Item::DECIMAL_ITEM && ( it->cmp_type() == INT_RESULT
|| it->type() == Item::STRING_ITEM || it->cmp_type() == DECIMAL_RESULT
|| it->type() == Item::REAL_ITEM || it->cmp_type() == STRING_RESULT
|| it->cmp_type() == REAL_RESULT
)
)
|| it->type() == Item::NULL_ITEM || it->type() == Item::NULL_ITEM
|| (it->type() == Item::FUNC_ITEM || (it->type() == Item::FUNC_ITEM
&& !isPredicateFunction(it, gwip))) && !gwip->rcWorkStack.empty() && !isPredicateFunction(it, gwip))) && !gwip->rcWorkStack.empty()
@ -5556,14 +5606,14 @@ void gp_walk(const Item* item, void* arg)
gwip->hasSubSelect = true; gwip->hasSubSelect = true;
gwip->subQuery = existsSub; gwip->subQuery = existsSub;
gwip->ptWorkStack.push(existsSub->transform()); gwip->ptWorkStack.push(existsSub->transform());
current_MIGR::infinidb_vtable.isUnion = true; // only temp. bypass the 2nd phase. MIGR::infinidb_vtable.isUnion = true; // only temp. bypass the 2nd phase.
// recover original // recover original
gwip->subQuery = orig; gwip->subQuery = orig;
gwip->lastSub = existsSub; gwip->lastSub = existsSub;
} }
else if (sub->substype() == Item_subselect::IN_SUBS) else if (sub->substype() == Item_subselect::IN_SUBS)
{ {
if (!((Item_in_subselect*)sub)->getOptimizer() && gwip->thd->derived_tables_processing) if (!((Item_in_subselect*)sub)->optimizer && gwip->thd->derived_tables_processing)
{ {
ostringstream oss; ostringstream oss;
oss << "Invalid In_optimizer: " << item->type(); oss << "Invalid In_optimizer: " << item->type();
@ -5602,12 +5652,6 @@ void gp_walk(const Item* item, void* arg)
break; break;
} }
case Item::DATE_ITEM:
{
Item_temporal_literal* itp = (Item_temporal_literal*)item;
gwip->rcWorkStack.push(buildReturnedColumn(itp, *gwip, gwip->fatalParseError));
break;
}
case Item::WINDOW_FUNC_ITEM: case Item::WINDOW_FUNC_ITEM:
{ {
@ -5661,6 +5705,7 @@ void gp_walk(const Item* item, void* arg)
printf("********** received TRIGGER_FIELD_ITEM *********\n"); printf("********** received TRIGGER_FIELD_ITEM *********\n");
break; break;
/* WIP MCOL-2178
case Item::XPATH_NODESET: case Item::XPATH_NODESET:
printf("********** received XPATH_NODESET *********\n"); printf("********** received XPATH_NODESET *********\n");
break; break;
@ -5672,13 +5717,14 @@ void gp_walk(const Item* item, void* arg)
case Item::VIEW_FIXER_ITEM: case Item::VIEW_FIXER_ITEM:
printf("********** received VIEW_FIXER_ITEM *********\n"); printf("********** received VIEW_FIXER_ITEM *********\n");
break; break;
*/
default: default:
{ {
if (gwip->condPush) if (gwip->condPush)
{ {
// push noop for unhandled item // push noop for unhandled item
SimpleColumn* rc = new SimpleColumn("noop"); SimpleColumn* rc = new SimpleColumn("noop");
rc->timeZone(gwip->thd->variables.time_zone->get_name()->ptr());
gwip->rcWorkStack.push(rc); gwip->rcWorkStack.push(rc);
break; break;
} }
@ -5771,11 +5817,16 @@ void parse_item (Item* item, vector<Item_field*>& field_vec,
// special handling for count(*). This should not be treated as constant. // special handling for count(*). This should not be treated as constant.
if (isp->argument_count() == 1 && if (isp->argument_count() == 1 &&
(sfitempp[0]->type() == Item::INT_ITEM || ( sfitempp[0]->type() == Item::CONST_ITEM &&
sfitempp[0]->type() == Item::STRING_ITEM || (sfitempp[0]->cmp_type() == INT_RESULT ||
sfitempp[0]->type() == Item::REAL_ITEM || sfitempp[0]->cmp_type() == STRING_RESULT ||
sfitempp[0]->type() == Item::DECIMAL_ITEM)) sfitempp[0]->cmp_type() == REAL_RESULT ||
sfitempp[0]->cmp_type() == DECIMAL_RESULT)
)
)
{
field_vec.push_back((Item_field*)item); //dummy field_vec.push_back((Item_field*)item); //dummy
}
for (uint32_t i = 0; i < isp->argument_count(); i++) for (uint32_t i = 0; i < isp->argument_count(); i++)
parse_item(sfitempp[i], field_vec, hasNonSupportItem, parseInfo); parse_item(sfitempp[i], field_vec, hasNonSupportItem, parseInfo);
@ -6025,7 +6076,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
if (table_ptr->derived) if (table_ptr->derived)
{ {
String str; String str;
(table_ptr->derived->first_select())->print(gwi.thd, &str, QT_INFINIDB_DERIVED); (table_ptr->derived->first_select())->print(gwi.thd, &str, QT_ORDINARY);
SELECT_LEX* select_cursor = table_ptr->derived->first_select(); SELECT_LEX* select_cursor = table_ptr->derived->first_select();
FromSubQuery fromSub(gwi, select_cursor); FromSubQuery fromSub(gwi, select_cursor);
@ -6051,7 +6102,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
} }
else if (table_ptr->view) else if (table_ptr->view)
{ {
View* view = new View(table_ptr->view->select_lex, &gwi); View* view = new View(*table_ptr->view->first_select_lex(), &gwi);
CalpontSystemCatalog::TableAliasName tn = make_aliastable(table_ptr->db.str, table_ptr->table_name.str, table_ptr->alias.str); CalpontSystemCatalog::TableAliasName tn = make_aliastable(table_ptr->db.str, table_ptr->table_name.str, table_ptr->alias.str);
view->viewName(tn); view->viewName(tn);
gwi.viewList.push_back(view); gwi.viewList.push_back(view);
@ -6187,7 +6238,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
// MariaDB bug 624 - without the fix_fields call, delete with join may error with "No query step". // MariaDB bug 624 - without the fix_fields call, delete with join may error with "No query step".
//#if MYSQL_VERSION_ID < 50172 //#if MYSQL_VERSION_ID < 50172
//@bug 3039. fix fields for constants //@bug 3039. fix fields for constants
if (!icp->fixed) if (!icp->is_fixed())
{ {
icp->fix_fields(gwi.thd, (Item**)&icp); icp->fix_fields(gwi.thd, (Item**)&icp);
} }
@ -6423,7 +6474,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
string fullname; string fullname;
String str; String str;
ifp->print(&str, QT_INFINIDB_NO_QUOTE); ifp->print(&str, QT_ORDINARY);
fullname = str.c_ptr(); fullname = str.c_ptr();
//sel_cols_in_create += fullname; //sel_cols_in_create += fullname;
@ -6485,7 +6536,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
gwi.returnedCols.push_back(spac); gwi.returnedCols.push_back(spac);
gwi.selectCols.push_back('`' + escapeBackTick(spac->alias().c_str()) + '`'); gwi.selectCols.push_back('`' + escapeBackTick(spac->alias().c_str()) + '`');
String str(256); String str(256);
item->print(&str, QT_INFINIDB_NO_QUOTE); item->print(&str, QT_ORDINARY);
if (sel_cols_in_create.length() != 0) if (sel_cols_in_create.length() != 0)
sel_cols_in_create += ", "; sel_cols_in_create += ", ";
@ -6559,7 +6610,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
{ {
redo = true; redo = true;
String str; String str;
ifp->print(&str, QT_INFINIDB_NO_QUOTE); ifp->print(&str, QT_ORDINARY);
gwi.selectCols.push_back(string(str.c_ptr()) + " " + "`" + escapeBackTick(item->name.str) + "`"); gwi.selectCols.push_back(string(str.c_ptr()) + " " + "`" + escapeBackTick(item->name.str) + "`");
} }
@ -6574,7 +6625,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
else else
{ {
String str(256); String str(256);
ifp->print(&str, QT_INFINIDB_NO_QUOTE); ifp->print(&str, QT_ORDINARY);
if (sel_cols_in_create.length() != 0) if (sel_cols_in_create.length() != 0)
sel_cols_in_create += ", "; sel_cols_in_create += ", ";
@ -6680,7 +6731,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
redo = true; redo = true;
// @bug 1706 // @bug 1706
String funcStr; String funcStr;
ifp->print(&funcStr, QT_INFINIDB); ifp->print(&funcStr, QT_ORDINARY);
string valStr; string valStr;
valStr.assign(funcStr.ptr(), funcStr.length()); valStr.assign(funcStr.ptr(), funcStr.length());
gwi.selectCols.push_back(valStr + " `" + escapeBackTick(ifp->name.str) + "`"); gwi.selectCols.push_back(valStr + " `" + escapeBackTick(ifp->name.str) + "`");
@ -6691,9 +6742,13 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
} }
break; break;
} } // End of FUNC_ITEM
case Item::INT_ITEM: case Item::CONST_ITEM:
{
switch(item->cmp_type())
{
case INT_RESULT:
{ {
if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI )) if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI ))
{ } { }
@ -6725,7 +6780,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
break; break;
} }
case Item::STRING_ITEM: case STRING_RESULT:
{ {
if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI )) if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI ))
{ } { }
@ -6753,7 +6808,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
break; break;
} }
case Item::DECIMAL_ITEM: case DECIMAL_RESULT:
{ {
if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI )) if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI ))
{ } { }
@ -6781,6 +6836,17 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
break; break;
} }
// WIP MCOL-2178 This switch doesn't handl
// ROW_, TIME_, REAL_RESULT and if one couldn't
// project the former two REAL is possible.
// Need to test before commit.
default:
{
//noop
}
}
break;
} // CONST_ITEM ends here
case Item::NULL_ITEM: case Item::NULL_ITEM:
{ {
@ -6858,7 +6924,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
gwi.returnedCols.push_back(SRCP(rc)); gwi.returnedCols.push_back(SRCP(rc));
String str; String str;
sub->get_select_lex()->print(gwi.thd, &str, QT_INFINIDB_NO_QUOTE); sub->get_select_lex()->print(gwi.thd, &str, QT_ORDINARY);
sel_cols_in_create += "(" + string(str.c_ptr()) + ")"; sel_cols_in_create += "(" + string(str.c_ptr()) + ")";
if (sub->name.length) if (sub->name.length)
@ -7027,7 +7093,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
} }
String str; String str;
funcFieldVec[i]->print(&str, QT_INFINIDB_NO_QUOTE); funcFieldVec[i]->print(&str, QT_ORDINARY);
sc->alias(string(str.c_ptr())); sc->alias(string(str.c_ptr()));
//sc->tableAlias(funcFieldVec[i]->table_name); //sc->tableAlias(funcFieldVec[i]->table_name);
sc->tableAlias(sc->tableAlias()); sc->tableAlias(sc->tableAlias());
@ -7068,7 +7134,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
SRCP minSc; // min width projected column. for count(*) use SRCP minSc; // min width projected column. for count(*) use
// Group by list. not valid for union main query // Group by list. not valid for union main query
if (MIGR::infinidb_vtable.vtable_state == THD::INFINIDB_CREATE_VTABLE && !unionSel) if (MIGR::infinidb_vtable.vtable_state == MIGR::INFINIDB_CREATE_VTABLE && !unionSel)
{ {
gwi.clauseType = GROUP_BY; gwi.clauseType = GROUP_BY;
Item* nonSupportItem = NULL; Item* nonSupportItem = NULL;
@ -7240,10 +7306,13 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
// @bug5638. The group by column is constant but not counter, alias has to match a column // @bug5638. The group by column is constant but not counter, alias has to match a column
// on the select list // on the select list
else if (!groupcol->counter_used && else if (!groupcol->counter_used &&
(groupItem->type() == Item::INT_ITEM || (groupItem->type() == Item::CONST_ITEM &&
groupItem->type() == Item::STRING_ITEM || (groupItem->cmp_type() == INT_RESULT ||
groupItem->type() == Item::REAL_ITEM || groupItem->cmp_type() == STRING_RESULT ||
groupItem->type() == Item::DECIMAL_ITEM)) groupItem->cmp_type() == REAL_RESULT ||
groupItem->cmp_type() == DECIMAL_RESULT)
)
)
{ {
ReturnedColumn* rc = 0; ReturnedColumn* rc = 0;
@ -7345,7 +7414,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
} }
} }
if (MIGR::infinidb_vtable.vtable_state == THD::INFINIDB_CREATE_VTABLE) if (MIGR::infinidb_vtable.vtable_state == MIGR::INFINIDB_CREATE_VTABLE)
{ {
SQL_I_List<ORDER> order_list = select_lex.order_list; SQL_I_List<ORDER> order_list = select_lex.order_list;
ORDER* ordercol = reinterpret_cast<ORDER*>(order_list.first); ORDER* ordercol = reinterpret_cast<ORDER*>(order_list.first);
@ -7364,7 +7433,10 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
if ((*(ordercol->item))->type() == Item::WINDOW_FUNC_ITEM) if ((*(ordercol->item))->type() == Item::WINDOW_FUNC_ITEM)
gwi.hasWindowFunc = true; gwi.hasWindowFunc = true;
// MCOL-2166 Looking for this sorting item in GROUP_BY items list. // MCOL-2166 Looking for this sorting item in GROUP_BY items list.
// Shouldn't look into this if query doesn't have GROUP BY or
// aggregations
if(isPushdownHand if(isPushdownHand
&& select_lex.agg_func_used() && select_lex.group_list.first
&& !sortItemIsInGrouping(*ordercol->item, select_lex.group_list.first)) && !sortItemIsInGrouping(*ordercol->item, select_lex.group_list.first))
{ {
std::ostringstream ostream; std::ostringstream ostream;
@ -7404,15 +7476,28 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
Item* ord_item = *(ordercol->item); Item* ord_item = *(ordercol->item);
// ignore not_used column on order by. // ignore not_used column on order by.
if (ord_item->type() == Item::INT_ITEM && ord_item->full_name() && string(ord_item->full_name()) == "Not_used") if ((ord_item->type() == Item::CONST_ITEM
&& ord_item->cmp_type() == INT_RESULT)
&& ord_item->full_name()
&& !strcmp(ord_item->full_name(), "Not_used"))
{
continue; continue;
else if (ord_item->type() == Item::INT_ITEM) }
else if (ord_item->type() == Item::CONST_ITEM
&& ord_item->cmp_type() == INT_RESULT)
{
// WIP MCOL-2178. We should seek smallest
// column here and not just previous.
rc = gwi.returnedCols[((Item_int*)ord_item)->val_int() - 1]->clone(); rc = gwi.returnedCols[((Item_int*)ord_item)->val_int() - 1]->clone();
}
else if (ord_item->type() == Item::SUBSELECT_ITEM) else if (ord_item->type() == Item::SUBSELECT_ITEM)
{
gwi.fatalParseError = true; gwi.fatalParseError = true;
}
else else
{
rc = buildReturnedColumn(ord_item, gwi, gwi.fatalParseError); rc = buildReturnedColumn(ord_item, gwi, gwi.fatalParseError);
}
// @bug5501 try item_ptr if item can not be fixed. For some // @bug5501 try item_ptr if item can not be fixed. For some
// weird dml statement state, item can not be fixed but the // weird dml statement state, item can not be fixed but the
// infomation is available in item_ptr. // infomation is available in item_ptr.
@ -7603,7 +7688,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
// @bug 3076. do not add the argument of aggregate function to the SELECT list, // @bug 3076. do not add the argument of aggregate function to the SELECT list,
// instead, add the whole column // instead, add the whole column
String str; String str;
ord_item->print(&str, QT_INFINIDB_NO_QUOTE); ord_item->print(&str, QT_ORDINARY);
if (sel_cols_in_create.length() != 0) if (sel_cols_in_create.length() != 0)
sel_cols_in_create += ", "; sel_cols_in_create += ", ";
@ -7684,7 +7769,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
} }
String str; String str;
ord_item->print(&str, QT_INFINIDB); ord_item->print(&str, QT_ORDINARY);
ord_cols += str.c_ptr(); ord_cols += str.c_ptr();
} }
@ -7708,7 +7793,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
} }
String str; String str;
fieldVec[i]->print(&str, QT_INFINIDB_NO_QUOTE); fieldVec[i]->print(&str, QT_ORDINARY);
sc->alias(string(str.c_ptr())); sc->alias(string(str.c_ptr()));
SRCP srcp(sc); SRCP srcp(sc);
uint32_t j = 0; uint32_t j = 0;
@ -7863,7 +7948,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
continue; continue;
String str; String str;
(table_ptr->derived->first_select())->print(gwi.thd, &str, QT_INFINIDB_DERIVED); (table_ptr->derived->first_select())->print(gwi.thd, &str, QT_ORDINARY);
if (!firstTb) if (!firstTb)
create_query += ", "; create_query += ", ";
@ -7925,7 +8010,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
MIGR::infinidb_vtable.create_vtable_query.free(); MIGR::infinidb_vtable.create_vtable_query.free();
MIGR::infinidb_vtable.create_vtable_query.append(create_query.c_str(), create_query.length()); MIGR::infinidb_vtable.create_vtable_query.append(create_query.c_str(), create_query.length());
MIGR::infinidb_vtable.vtable_state = THD::INFINIDB_REDO_PHASE1; // redo phase 1 MIGR::infinidb_vtable.vtable_state = MIGR::INFINIDB_REDO_PHASE1; // redo phase 1
// turn off select distinct from post process unless there're post process functions // turn off select distinct from post process unless there're post process functions
// on the select list. // on the select list.
@ -8045,7 +8130,8 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
else if (ord_item->name.length) else if (ord_item->name.length)
{ {
// for union order by 1 case. For unknown reason, it doesn't show in_field_list // for union order by 1 case. For unknown reason, it doesn't show in_field_list
if (ord_item->type() == Item::INT_ITEM) if (ord_item->type() == Item::CONST_ITEM
&& ord_item->cmp_type() == INT_RESULT)
{ {
ord_cols += ord_item->name.str; ord_cols += ord_item->name.str;
} }
@ -8079,7 +8165,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
else else
{ {
String str; String str;
ord_item->print(&str, QT_INFINIDB_NO_QUOTE); ord_item->print(&str, QT_ORDINARY);
ord_cols += string(str.c_ptr()); ord_cols += string(str.c_ptr());
} }
@ -8158,9 +8244,9 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
// select_lex->offset_limit if not null. // select_lex->offset_limit if not null.
if (join->select_lex && if (join->select_lex &&
join->select_lex->offset_limit && join->select_lex->offset_limit &&
join->select_lex->offset_limit->fixed && join->select_lex->offset_limit->is_fixed() &&
join->select_lex->select_limit && join->select_lex->select_limit &&
join->select_lex->select_limit->fixed) join->select_lex->select_limit->is_fixed())
{ {
limitOffset = join->select_lex->offset_limit->val_int(); limitOffset = join->select_lex->offset_limit->val_int();
limitNum = join->select_lex->select_limit->val_int(); limitNum = join->select_lex->select_limit->val_int();
@ -8196,7 +8282,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
// do not set in csep. @bug5096. ignore session limit setting for dml // do not set in csep. @bug5096. ignore session limit setting for dml
if ((gwi.thd->variables.select_limit == (uint64_t) - 1 || if ((gwi.thd->variables.select_limit == (uint64_t) - 1 ||
(gwi.thd->variables.select_limit != (uint64_t) - 1 && (gwi.thd->variables.select_limit != (uint64_t) - 1 &&
MIGR::infinidb_vtable.vtable_state != THD::INFINIDB_CREATE_VTABLE)) && MIGR::infinidb_vtable.vtable_state != MIGR::INFINIDB_CREATE_VTABLE)) &&
!csep->hasOrderBy()) !csep->hasOrderBy())
{ {
csep->limitStart(limitOffset); csep->limitStart(limitOffset);
@ -8329,7 +8415,8 @@ int cp_get_plan(THD* thd, SCSEP& csep)
LEX* lex = thd->lex; LEX* lex = thd->lex;
idbassert(lex != 0); idbassert(lex != 0);
SELECT_LEX select_lex = lex->select_lex; // WIP MCOL-2178 A questionable replacement.
SELECT_LEX select_lex = *lex->first_select_lex();
gp_walk_info gwi; gp_walk_info gwi;
gwi.thd = thd; gwi.thd = thd;
int status = getSelectPlan(gwi, select_lex, csep); int status = getSelectPlan(gwi, select_lex, csep);
@ -8667,7 +8754,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
if (table_ptr->derived) if (table_ptr->derived)
{ {
String str; String str;
(table_ptr->derived->first_select())->print(gwi.thd, &str, QT_INFINIDB_DERIVED); (table_ptr->derived->first_select())->print(gwi.thd, &str, QT_ORDINARY);
SELECT_LEX* select_cursor = table_ptr->derived->first_select(); SELECT_LEX* select_cursor = table_ptr->derived->first_select();
FromSubQuery fromSub(gwi, select_cursor); FromSubQuery fromSub(gwi, select_cursor);
@ -8693,7 +8780,8 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
} }
else if (table_ptr->view) else if (table_ptr->view)
{ {
View* view = new View(table_ptr->view->select_lex, &gwi); // WIP MCOL-2178 A questionable replacement.
View* view = new View(*table_ptr->view->first_select_lex(), &gwi);
CalpontSystemCatalog::TableAliasName tn = make_aliastable(table_ptr->db.str, table_ptr->table_name.str, table_ptr->alias.str); CalpontSystemCatalog::TableAliasName tn = make_aliastable(table_ptr->db.str, table_ptr->table_name.str, table_ptr->alias.str);
view->viewName(tn); view->viewName(tn);
gwi.viewList.push_back(view); gwi.viewList.push_back(view);
@ -8763,7 +8851,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
// MariaDB bug 624 - without the fix_fields call, delete with join may error with "No query step". // MariaDB bug 624 - without the fix_fields call, delete with join may error with "No query step".
//#if MYSQL_VERSION_ID < 50172 //#if MYSQL_VERSION_ID < 50172
//@bug 3039. fix fields for constants //@bug 3039. fix fields for constants
if (!icp->fixed) if (!icp->is_fixed())
{ {
icp->fix_fields(gwi.thd, (Item**)&icp); icp->fix_fields(gwi.thd, (Item**)&icp);
} }
@ -8948,7 +9036,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
string fullname; string fullname;
String str; String str;
ifp->print(&str, QT_INFINIDB_NO_QUOTE); ifp->print(&str, QT_ORDINARY);
fullname = str.c_ptr(); fullname = str.c_ptr();
//sel_cols_in_create += fullname; //sel_cols_in_create += fullname;
@ -9023,7 +9111,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
gwi.selectCols.push_back('`' + escapeBackTick(spac->alias().c_str()) + '`'); gwi.selectCols.push_back('`' + escapeBackTick(spac->alias().c_str()) + '`');
String str(256); String str(256);
item->print(&str, QT_INFINIDB_NO_QUOTE); item->print(&str, QT_ORDINARY);
if (sel_cols_in_create.length() != 0) if (sel_cols_in_create.length() != 0)
sel_cols_in_create += ", "; sel_cols_in_create += ", ";
@ -9097,7 +9185,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
{ {
redo = true; redo = true;
String str; String str;
ifp->print(&str, QT_INFINIDB_NO_QUOTE); ifp->print(&str, QT_ORDINARY);
gwi.selectCols.push_back(string(str.c_ptr()) + " " + "`" + escapeBackTick(item->name.str) + "`"); gwi.selectCols.push_back(string(str.c_ptr()) + " " + "`" + escapeBackTick(item->name.str) + "`");
} }
@ -9112,7 +9200,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
else else
{ {
String str(256); String str(256);
ifp->print(&str, QT_INFINIDB_NO_QUOTE); ifp->print(&str, QT_ORDINARY);
if (sel_cols_in_create.length() != 0) if (sel_cols_in_create.length() != 0)
sel_cols_in_create += ", "; sel_cols_in_create += ", ";
@ -9221,7 +9309,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_ORDINARY);
gwi.selectCols.push_back(string(funcStr.c_ptr()) + " `" + escapeBackTick(ifp->name.str) + "`"); gwi.selectCols.push_back(string(funcStr.c_ptr()) + " `" + escapeBackTick(ifp->name.str) + "`");
// clear the error set by buildFunctionColumn // clear the error set by buildFunctionColumn
gwi.fatalParseError = false; gwi.fatalParseError = false;
@ -9232,7 +9320,11 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
break; break;
} }
case Item::INT_ITEM: case Item::CONST_ITEM:
{
switch(item->cmp_type())
{
case INT_RESULT:
{ {
if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI )) if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI ))
{ } { }
@ -9264,7 +9356,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
break; break;
} }
case Item::STRING_ITEM: case STRING_RESULT:
{ {
if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI )) if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI ))
{ } { }
@ -9292,7 +9384,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
break; break;
} }
case Item::DECIMAL_ITEM: case DECIMAL_RESULT:
{ {
if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI )) if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI ))
{ } { }
@ -9320,9 +9412,18 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
break; break;
} }
default:
// WIP MCOL-2178 Same thing as for getSelectPlan
{
// noop
}
}
break;
} // CONST_ITEM ends here
case Item::NULL_ITEM: case Item::NULL_ITEM:
{ {
// WIP MCOL-2178 Check for NULL in projection.
/*if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI ) ) /*if ( ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE ) || ((gwi.thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) || ((gwi.thd->lex)->sql_command == SQLCOM_DELETE_MULTI ) )
{ } { }
else else
@ -9397,7 +9498,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
gwi.returnedCols.push_back(SRCP(rc)); gwi.returnedCols.push_back(SRCP(rc));
String str; String str;
sub->get_select_lex()->print(gwi.thd, &str, QT_INFINIDB_NO_QUOTE); sub->get_select_lex()->print(gwi.thd, &str, QT_ORDINARY);
sel_cols_in_create += "(" + string(str.c_ptr()) + ")"; sel_cols_in_create += "(" + string(str.c_ptr()) + ")";
if (sub->name.length) if (sub->name.length)
@ -9565,7 +9666,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
} }
String str; String str;
funcFieldVec[i]->print(&str, QT_INFINIDB_NO_QUOTE); funcFieldVec[i]->print(&str, QT_ORDINARY);
sc->alias(string(str.c_ptr())); sc->alias(string(str.c_ptr()));
//sc->tableAlias(funcFieldVec[i]->table_name); //sc->tableAlias(funcFieldVec[i]->table_name);
sc->tableAlias(sc->tableAlias()); sc->tableAlias(sc->tableAlias());
@ -9606,7 +9707,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
SRCP minSc; // min width projected column. for count(*) use SRCP minSc; // min width projected column. for count(*) use
// Group by list. not valid for union main query // Group by list. not valid for union main query
if (MIGR::infinidb_vtable.vtable_state == THD::INFINIDB_CREATE_VTABLE && !unionSel) if (MIGR::infinidb_vtable.vtable_state == MIGR::INFINIDB_CREATE_VTABLE && !unionSel)
{ {
gwi.clauseType = GROUP_BY; gwi.clauseType = GROUP_BY;
Item* nonSupportItem = NULL; Item* nonSupportItem = NULL;
@ -9778,10 +9879,14 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
// @bug5638. The group by column is constant but not counter, alias has to match a column // @bug5638. The group by column is constant but not counter, alias has to match a column
// on the select list // on the select list
else if (!groupcol->counter_used && else if (!groupcol->counter_used &&
(groupItem->type() == Item::INT_ITEM || (groupItem->type() == Item::CONST_ITEM &&
groupItem->type() == Item::STRING_ITEM || (groupItem->cmp_type() == INT_RESULT ||
groupItem->type() == Item::REAL_ITEM || groupItem->cmp_type() == STRING_RESULT ||
groupItem->type() == Item::DECIMAL_ITEM)) groupItem->cmp_type() == REAL_RESULT ||
groupItem->cmp_type() == DECIMAL_RESULT)
)
)
{ {
ReturnedColumn* rc = 0; ReturnedColumn* rc = 0;
@ -9885,7 +9990,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
// ORDER BY processing starts here // ORDER BY processing starts here
if (MIGR::infinidb_vtable.vtable_state == THD::INFINIDB_CREATE_VTABLE) if (MIGR::infinidb_vtable.vtable_state == MIGR::INFINIDB_CREATE_VTABLE)
{ {
ORDER* ordercol = reinterpret_cast<ORDER*>(gi.groupByOrder); ORDER* ordercol = reinterpret_cast<ORDER*>(gi.groupByOrder);
string create_query(MIGR::infinidb_vtable.create_vtable_query.c_ptr()); string create_query(MIGR::infinidb_vtable.create_vtable_query.c_ptr());
@ -9929,12 +10034,22 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
bool nonAggField = true; bool nonAggField = true;
// ignore not_used column on order by. // ignore not_used column on order by.
if (ord_item->type() == Item::INT_ITEM && ord_item->full_name() && string(ord_item->full_name()) == "Not_used") if ((ord_item->type() == Item::CONST_ITEM
&& ord_item->cmp_type() == INT_RESULT)
&& ord_item->full_name()
&& !strcmp(ord_item->full_name(), "Not_used"))
{
continue; continue;
else if (ord_item->type() == Item::INT_ITEM) }
else if (ord_item->type() == Item::CONST_ITEM
&& ord_item->cmp_type() == INT_RESULT)
{
rc = gwi.returnedCols[((Item_int*)ord_item)->val_int() - 1]->clone(); rc = gwi.returnedCols[((Item_int*)ord_item)->val_int() - 1]->clone();
}
else if (ord_item->type() == Item::SUBSELECT_ITEM) else if (ord_item->type() == Item::SUBSELECT_ITEM)
{
gwi.fatalParseError = true; gwi.fatalParseError = true;
}
else if (ordercol->in_field_list && ord_item->type() == Item::FIELD_ITEM) else if (ordercol->in_field_list && ord_item->type() == Item::FIELD_ITEM)
{ {
rc = buildReturnedColumn(ord_item, gwi, gwi.fatalParseError); rc = buildReturnedColumn(ord_item, gwi, gwi.fatalParseError);
@ -10159,7 +10274,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
continue; continue;
String str; String str;
(table_ptr->derived->first_select())->print(gwi.thd, &str, QT_INFINIDB_DERIVED); (table_ptr->derived->first_select())->print(gwi.thd, &str, QT_ORDINARY);
if (!firstTb) if (!firstTb)
create_query += ", "; create_query += ", ";
@ -10221,7 +10336,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
MIGR::infinidb_vtable.create_vtable_query.free(); MIGR::infinidb_vtable.create_vtable_query.free();
MIGR::infinidb_vtable.create_vtable_query.append(create_query.c_str(), create_query.length()); MIGR::infinidb_vtable.create_vtable_query.append(create_query.c_str(), create_query.length());
MIGR::infinidb_vtable.vtable_state = THD::INFINIDB_REDO_PHASE1; // redo phase 1 MIGR::infinidb_vtable.vtable_state = MIGR::INFINIDB_REDO_PHASE1; // redo phase 1
// turn off select distinct from post process unless there're post process functions // turn off select distinct from post process unless there're post process functions
// on the select list. // on the select list.
@ -10346,7 +10461,8 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
else if (ord_item->name.length) else if (ord_item->name.length)
{ {
// for union order by 1 case. For unknown reason, it doesn't show in_field_list // for union order by 1 case. For unknown reason, it doesn't show in_field_list
if (ord_item->type() == Item::INT_ITEM) if (ord_item->type() == Item::CONST_ITEM
&& ord_item->cmp_type() == INT_RESULT)
{ {
ord_cols += ord_item->name.str; ord_cols += ord_item->name.str;
} }
@ -10380,7 +10496,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
else else
{ {
String str; String str;
ord_item->print(&str, QT_INFINIDB_NO_QUOTE); ord_item->print(&str, QT_ORDINARY);
ord_cols += string(str.c_ptr()); ord_cols += string(str.c_ptr());
} }

84
dbcon/mysql/ha_calpont_impl.cpp
View File

@ -752,8 +752,8 @@ int fetchNextRow(uchar* buf, cal_table_info& ti, cal_connection_info* ci, bool h
//float float_val = *(float*)(&value); //float float_val = *(float*)(&value);
//f2->store(float_val); //f2->store(float_val);
if (f2->decimals() < (uint32_t)row.getScale(s))
// WIP MCOL-2178 // WIP MCOL-2178
//if (f2->decimals() < (uint32_t)row.getScale(s))
//f2->dec = (uint32_t)row.getScale(s); //f2->dec = (uint32_t)row.getScale(s);
f2->store(dl); f2->store(dl);
@ -1320,7 +1320,6 @@ uint32_t doUpdateDelete(THD* thd)
} }
// @bug 1127. Re-construct update stmt using lex instead of using the original query. // @bug 1127. Re-construct update stmt using lex instead of using the original query.
// string dmlStmt="";
string dmlStmt = string(idb_mysql_query_str(thd)); string dmlStmt = string(idb_mysql_query_str(thd));
string schemaName; string schemaName;
string tableName(""); string tableName("");
@ -1338,28 +1337,16 @@ uint32_t doUpdateDelete(THD* thd)
{ {
ColumnAssignment* columnAssignmentPtr; ColumnAssignment* columnAssignmentPtr;
Item_field* item; Item_field* item;
// TABLE_LIST* table_ptr = thd->lex->thd->lex->first_select_lex()->get_table_list(); List_iterator_fast<Item> field_it(thd->lex->first_select_lex()->item_list);
List_iterator_fast<Item> field_it(thd->lex->thd->lex->first_select_lex()->item_list);
List_iterator_fast<Item> value_it(thd->lex->value_list); List_iterator_fast<Item> value_it(thd->lex->value_list);
// dmlStmt += "update ";
updateCP->queryType(CalpontSelectExecutionPlan::UPDATE); updateCP->queryType(CalpontSelectExecutionPlan::UPDATE);
ci->stats.fQueryType = updateCP->queryType(); ci->stats.fQueryType = updateCP->queryType();
uint32_t cnt = 0; uint32_t cnt = 0;
tr1::unordered_set<string> timeStampColumnNames; tr1::unordered_set<string> timeStampColumnNames;
// for (; table_ptr; table_ptr= table_ptr->next_local)
// {
// dmlStmt += string(table_ptr->table_name);
// if (table_ptr->next_local)
// dmlStmt += ", ";
// }
// dmlStmt += " set ";
while ((item = (Item_field*) field_it++)) while ((item = (Item_field*) field_it++))
{ {
cnt++; cnt++;
// dmlStmt += string(item->name) + "=";
string tmpTableName = bestTableName(item); string tmpTableName = bestTableName(item);
@ -1411,7 +1398,9 @@ uint32_t doUpdateDelete(THD* thd)
columnAssignmentPtr->fFuncScale = 0; columnAssignmentPtr->fFuncScale = 0;
Item* value = value_it++; Item* value = value_it++;
if (value->type() == Item::STRING_ITEM) if (value->type() == Item::CONST_ITEM)
{
if (value->cmp_type() == STRING_RESULT)
{ {
//@Bug 2587 use val_str to replace value->name to get rid of 255 limit //@Bug 2587 use val_str to replace value->name to get rid of 255 limit
String val, *str; String val, *str;
@ -1419,13 +1408,31 @@ uint32_t doUpdateDelete(THD* thd)
columnAssignmentPtr->fScalarExpression.assign(str->ptr(), str->length()); columnAssignmentPtr->fScalarExpression.assign(str->ptr(), str->length());
columnAssignmentPtr->fFromCol = false; columnAssignmentPtr->fFromCol = false;
} }
else if ( value->type() == Item::VARBIN_ITEM ) else if (value->cmp_type() == INT_RESULT)
{
std::ostringstream oss;
if (value->unsigned_flag)
{
oss << value->val_uint();
}
else
{
oss << value->val_int();
}
columnAssignmentPtr->fScalarExpression = oss.str();
columnAssignmentPtr->fFromCol = false;
}
}
// WIP MCOL-2178
/*else if ( value->type() == Item::VARBIN_ITEM )
{ {
String val, *str; String val, *str;
str = value->val_str(&val); str = value->val_str(&val);
columnAssignmentPtr->fScalarExpression.assign(str->ptr(), str->length()); columnAssignmentPtr->fScalarExpression.assign(str->ptr(), str->length());
columnAssignmentPtr->fFromCol = false; columnAssignmentPtr->fFromCol = false;
} }*/
else if ( value->type() == Item::FUNC_ITEM ) else if ( value->type() == Item::FUNC_ITEM )
{ {
//Bug 2092 handle negative values //Bug 2092 handle negative values
@ -1491,23 +1498,6 @@ uint32_t doUpdateDelete(THD* thd)
} }
} }
} }
else if ( value->type() == Item::INT_ITEM )
{
std::ostringstream oss;
if (value->unsigned_flag)
{
oss << value->val_uint();
}
else
{
oss << value->val_int();
}
// dmlStmt += oss.str();
columnAssignmentPtr->fScalarExpression = oss.str();
columnAssignmentPtr->fFromCol = false;
}
else if ( value->type() == Item::FIELD_ITEM) else if ( value->type() == Item::FIELD_ITEM)
{ {
isFromCol = true; isFromCol = true;
@ -1590,8 +1580,6 @@ uint32_t doUpdateDelete(THD* thd)
} }
colAssignmentListPtr->push_back ( columnAssignmentPtr ); colAssignmentListPtr->push_back ( columnAssignmentPtr );
// if (cnt < thd->lex->thd->lex->first_select_lex()->item_list.elements)
// dmlStmt += ", ";
} }
// Support for on update current_timestamp() for timestamp fields // Support for on update current_timestamp() for timestamp fields
@ -1620,7 +1608,6 @@ uint32_t doUpdateDelete(THD* thd)
} }
else else
{ {
// dmlStmt = string(idb_mysql_query_str(thd));
updateCP->queryType(CalpontSelectExecutionPlan::DELETE); updateCP->queryType(CalpontSelectExecutionPlan::DELETE);
ci->stats.fQueryType = updateCP->queryType(); ci->stats.fQueryType = updateCP->queryType();
} }
@ -1639,7 +1626,7 @@ uint32_t doUpdateDelete(THD* thd)
} }
else else
{ {
first_table = (TABLE_LIST*) thd->lex->thd->lex->first_select_lex()->table_list.first; first_table = (TABLE_LIST*) thd->lex->first_select_lex()->table_list.first;
aTableName.schema = first_table->table->s->db.str; aTableName.schema = first_table->table->s->db.str;
aTableName.table = first_table->table->s->table_name.str; aTableName.table = first_table->table->s->table_name.str;
} }
@ -1690,9 +1677,9 @@ uint32_t doUpdateDelete(THD* thd)
} }
else if ((thd->lex)->sql_command == SQLCOM_DELETE_MULTI) //@Bug 6121 error out on multi tables delete. else if ((thd->lex)->sql_command == SQLCOM_DELETE_MULTI) //@Bug 6121 error out on multi tables delete.
{ {
if ( (thd->lex->thd->lex->first_select_lex()->join) != 0) if ( (thd->lex->first_select_lex()->join) != 0)
{ {
multi_delete* deleteTable = (multi_delete*)((thd->lex->thd->lex->first_select_lex()->join)->result); multi_delete* deleteTable = (multi_delete*)((thd->lex->first_select_lex()->join)->result);
first_table = (TABLE_LIST*) deleteTable->get_tables(); first_table = (TABLE_LIST*) deleteTable->get_tables();
if (deleteTable->get_num_of_tables() == 1) if (deleteTable->get_num_of_tables() == 1)
@ -1715,7 +1702,7 @@ uint32_t doUpdateDelete(THD* thd)
} }
else else
{ {
first_table = (TABLE_LIST*) thd->lex->thd->lex->first_select_lex()->table_list.first; first_table = (TABLE_LIST*) thd->lex->first_select_lex()->table_list.first;
schemaName = first_table->table->s->db.str; schemaName = first_table->table->s->db.str;
tableName = first_table->table->s->table_name.str; tableName = first_table->table->s->table_name.str;
aliasName = first_table->alias.str; aliasName = first_table->alias.str;
@ -1726,7 +1713,7 @@ uint32_t doUpdateDelete(THD* thd)
} }
else else
{ {
first_table = (TABLE_LIST*) thd->lex->thd->lex->first_select_lex()->table_list.first; first_table = (TABLE_LIST*) thd->lex->first_select_lex()->table_list.first;
schemaName = first_table->table->s->db.str; schemaName = first_table->table->s->db.str;
tableName = first_table->table->s->table_name.str; tableName = first_table->table->s->table_name.str;
aliasName = first_table->alias.str; aliasName = first_table->alias.str;
@ -1759,8 +1746,8 @@ uint32_t doUpdateDelete(THD* thd)
if (( (thd->lex)->sql_command == SQLCOM_UPDATE ) || ( (thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) ) if (( (thd->lex)->sql_command == SQLCOM_UPDATE ) || ( (thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) )
{ {
items = (thd->lex->thd->lex->first_select_lex()->item_list); items = (thd->lex->first_select_lex()->item_list);
thd->lex->thd->lex->first_select_lex()->item_list = thd->lex->value_list; thd->lex->first_select_lex()->item_list = thd->lex->value_list;
} }
select_lex = *lex->first_select_lex(); select_lex = *lex->first_select_lex();
@ -1824,7 +1811,7 @@ uint32_t doUpdateDelete(THD* thd)
// @bug 4457. MySQL inconsistence! for some queries, some structures are only available // @bug 4457. MySQL inconsistence! for some queries, some structures are only available
// in the derived_tables_processing phase. So by pass the phase for DML only when the // in the derived_tables_processing phase. So by pass the phase for DML only when the
// execution plan can not be successfully generated. recover lex before returning; // execution plan can not be successfully generated. recover lex before returning;
thd->lex->thd->lex->first_select_lex()->item_list = items; thd->lex->first_select_lex()->item_list = items;
MIGR::infinidb_vtable.vtable_state = origState; MIGR::infinidb_vtable.vtable_state = origState;
return 0; return 0;
} }
@ -1975,7 +1962,7 @@ uint32_t doUpdateDelete(THD* thd)
//cout<< "Plan is " << endl << *updateCP << endl; //cout<< "Plan is " << endl << *updateCP << endl;
if (( (thd->lex)->sql_command == SQLCOM_UPDATE ) || ( (thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) ) if (( (thd->lex)->sql_command == SQLCOM_UPDATE ) || ( (thd->lex)->sql_command == SQLCOM_UPDATE_MULTI ) )
thd->lex->thd->lex->first_select_lex()->item_list = items; thd->lex->first_select_lex()->item_list = items;
} }
//cout<< "Plan is " << endl << *updateCP << endl; //cout<< "Plan is " << endl << *updateCP << endl;
@ -3253,7 +3240,7 @@ int ha_calpont_impl_delete_table(const char* name)
} }
else else
{ {
TABLE_LIST* first_table = (TABLE_LIST*) thd->lex->thd->lex->first_select_lex()->table_list.first; TABLE_LIST* first_table = (TABLE_LIST*) thd->lex->first_select_lex()->table_list.first;
dbName = const_cast<char*>(first_table->db.str); dbName = const_cast<char*>(first_table->db.str);
} }
@ -4280,7 +4267,6 @@ int ha_calpont_impl_close_connection (handlerton* hton, THD* thd)
int ha_calpont_impl_rename_table(const char* from, const char* to) int ha_calpont_impl_rename_table(const char* from, const char* to)
{ {
IDEBUG( cout << "ha_calpont_impl_rename_table: " << from << " => " << to << endl ); IDEBUG( cout << "ha_calpont_impl_rename_table: " << from << " => " << to << endl );
THD* thd = current_thd;
if (get_fe_conn_info_ptr() == NULL) if (get_fe_conn_info_ptr() == NULL)
set_fe_conn_info_ptr((void*)new cal_connection_info()); set_fe_conn_info_ptr((void*)new cal_connection_info());

14
dbcon/mysql/ha_mcs_pushdown.cpp
View File

@ -129,11 +129,11 @@ create_calpont_group_by_handler(THD* thd, Query* query)
SELECT_LEX *select_lex = query->from->select_lex; SELECT_LEX *select_lex = query->from->select_lex;
// Create a handler if query is valid. See comments for details. // Create a handler if query is valid. See comments for details.
if ( MIGR::infinidb_vtable.vtable_state == MIGR::INFINIDB_DISABLE_VTABLE if //( MIGR::infinidb_vtable.vtable_state == MIGR::INFINIDB_DISABLE_VTABLE
// WIP MCOL-2178 // WIP MCOL-2178
//&& ( MIGR::infinidb_vtable_mode == 0 //&& ( MIGR::infinidb_vtable_mode == 0
// || MIGR::infinidb_vtable_mode == 2 ) // || MIGR::infinidb_vtable_mode == 2 )
&& ( query->group_by || select_lex->with_sum_func ) ) ( query->group_by || select_lex->with_sum_func ) //)
{ {
bool unsupported_feature = false; bool unsupported_feature = false;
// revisit SELECT_LEX for all units // revisit SELECT_LEX for all units
@ -214,12 +214,12 @@ create_columnstore_derived_handler(THD* thd, TABLE_LIST *derived)
SELECT_LEX_UNIT *unit= derived->derived; SELECT_LEX_UNIT *unit= derived->derived;
if ( MIGR::infinidb_vtable.vtable_state != MIGR::INFINIDB_DISABLE_VTABLE ) /* //if ( MIGR::infinidb_vtable.vtable_state != MIGR::INFINIDB_DISABLE_VTABLE )
// WIP MCOL-2178 // WIP MCOL-2178
// && MIGR::infinidb_vtable_mode != 0 ) // && MIGR::infinidb_vtable_mode != 0 )
{ {
return 0; return 0;
} }*/
for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select()) for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select())
{ {
@ -472,13 +472,15 @@ create_columnstore_select_handler(THD* thd, SELECT_LEX* select_lex)
ha_columnstore_select_handler* handler = NULL; ha_columnstore_select_handler* handler = NULL;
handlerton *ht= 0; handlerton *ht= 0;
/*
// Return if vtable enabled. // Return if vtable enabled.
if ( MIGR::infinidb_vtable.vtable_state != MIGR::INFINIDB_DISABLE_VTABLE ) //if ( MIGR::infinidb_vtable.vtable_state != MIGR::INFINIDB_DISABLE_VTABLE )
// WIP MCOL-2178 // WIP MCOL-2178
// && MIGR::infinidb_vtable_mode != 0 ) // && MIGR::infinidb_vtable_mode != 0 )
{ {
return 0; return 0;
} }*/
for (SELECT_LEX* sl = select_lex;sl; sl= sl->next_select()) for (SELECT_LEX* sl = select_lex;sl; sl= sl->next_select())
{ {
if (!(sl->join)) if (!(sl->join))

4
dbcon/mysql/ha_view.cpp
View File

@ -109,7 +109,9 @@ void View::transform()
// for nested view, the view name is vout.vin... format // for nested view, the view name is vout.vin... format
CalpontSystemCatalog::TableAliasName tn = make_aliasview(table_ptr->db.str, table_ptr->table_name.str, table_ptr->alias.str, viewName); CalpontSystemCatalog::TableAliasName tn = make_aliasview(table_ptr->db.str, table_ptr->table_name.str, table_ptr->alias.str, viewName);
gwi.viewName = make_aliastable(table_ptr->db.str, table_ptr->table_name.str, viewName); gwi.viewName = make_aliastable(table_ptr->db.str, table_ptr->table_name.str, viewName);
View* view = new View(table_ptr->view->select_lex, &gwi); // WIP MCOL-2178 CS could mess with the SELECT_LEX unit so better
// use a copy.
View* view = new View(*table_ptr->view->first_select_lex(), &gwi);
view->viewName(gwi.viewName); view->viewName(gwi.viewName);
gwi.viewList.push_back(view); gwi.viewList.push_back(view);
view->transform(); view->transform();

3
dbcon/mysql/idb_mysql.h
View File

@ -154,7 +154,8 @@ class MIGR
INFINIDB_VTABLE() : cal_conn_info(NULL) {init();} INFINIDB_VTABLE() : cal_conn_info(NULL) {init();}
void init() void init()
{ {
vtable_state = INFINIDB_INIT_CONNECT; //vtable_state = INFINIDB_INIT_CONNECT;
vtable_state = INFINIDB_DISABLE_VTABLE;
autoswitch = false; autoswitch = false;
has_order_by = false; has_order_by = false;
duplicate_field_name = false; duplicate_field_name = false;

18
dbcon/mysql/my.cnf
View File

@ -47,21 +47,21 @@ group_concat_max_len=512
sql_mode="ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION" sql_mode="ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
# Enable compression by default on create, set to 0 to turn off # Enable compression by default on create, set to 0 to turn off
infinidb_compression_type=2 #columnstore_compression_type=2
# Default for string table threshhold # Default for string table threshhold
infinidb_stringtable_threshold=20 #columnstore_stringtable_threshold=20
# infinidb local query flag # infinidb local query flag
infinidb_local_query=0 #columnstore_local_query=0
infinidb_diskjoin_smallsidelimit=0 #columnstore_diskjoin_smallsidelimit=0
infinidb_diskjoin_largesidelimit=0 #columnstore_diskjoin_largesidelimit=0
infinidb_diskjoin_bucketsize=100 #columnstore_diskjoin_bucketsize=100
infinidb_um_mem_limit=0 #columnstore_um_mem_limit=0
infinidb_use_import_for_batchinsert=1 #columnstore_use_import_for_batchinsert=1
infinidb_import_for_batchinsert_delimiter=7 #columnstore_import_for_batchinsert_delimiter=7
basedir = /usr/local/mariadb/columnstore/mysql/ basedir = /usr/local/mariadb/columnstore/mysql/
character-sets-dir = /usr/local/mariadb/columnstore/mysql/share/charsets/ character-sets-dir = /usr/local/mariadb/columnstore/mysql/share/charsets/