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

Updates to plugin code based on recent changes in the server 10.5 branch.

Browse Source
This commit is contained in:
Gagan Goel
2020-03-12 00:42:16 +00:00
parent f01185f991
commit 457ec0d483
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dbcon/mysql/ha_mcs.cpp
View File

@ -146,7 +146,7 @@ static int columnstore_init_func(void* p)
#ifndef _MSC_VER #ifndef _MSC_VER
(void) pthread_mutex_init(&mcs_mutex, MY_MUTEX_INIT_FAST); (void) pthread_mutex_init(&mcs_mutex, MY_MUTEX_INIT_FAST);
#endif #endif
(void) my_hash_init(&mcs_open_tables, system_charset_info, 32, 0, 0, (void) my_hash_init(PSI_NOT_INSTRUMENTED, &mcs_open_tables, system_charset_info, 32, 0, 0,
(my_hash_get_key) mcs_get_key, 0, 0); (my_hash_get_key) mcs_get_key, 0, 0);
mcs_hton->create = mcs_create_handler; mcs_hton->create = mcs_create_handler;
@ -909,7 +909,7 @@ int ha_mcs::external_lock(THD* thd, int lock_type)
{ {
//@Bug 2526 Only register the transaction when autocommit is off //@Bug 2526 Only register the transaction when autocommit is off
if ((thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) if ((thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)))
trans_register_ha( thd, true, mcs_hton); trans_register_ha( thd, true, mcs_hton, 0);
rc = ha_mcs_impl_external_lock(thd, table, lock_type); rc = ha_mcs_impl_external_lock(thd, table, lock_type);
} }

12
dbcon/mysql/ha_mcs_execplan.cpp
View File

@ -2382,7 +2382,7 @@ SimpleColumn* buildSimpleColFromDerivedTable(gp_walk_info& gwi, Item_field* ifp)
sc->oid(oidlist[j].objnum); sc->oid(oidlist[j].objnum);
// @bug 3003. Keep column alias if it has. // @bug 3003. Keep column alias if it has.
sc->alias(ifp->is_autogenerated_name ? tcn.column : ifp->name.str); sc->alias(ifp->is_autogenerated_name() ? tcn.column : ifp->name.str);
sc->tableAlias(lower(gwi.tbList[i].alias)); sc->tableAlias(lower(gwi.tbList[i].alias));
sc->viewName(lower(viewName)); sc->viewName(lower(viewName));
@ -2440,7 +2440,7 @@ SimpleColumn* buildSimpleColFromDerivedTable(gp_walk_info& gwi, Item_field* ifp)
sc->columnName(col->columnName()); sc->columnName(col->columnName());
// @bug 3003. Keep column alias if it has. // @bug 3003. Keep column alias if it has.
sc->alias(ifp->is_autogenerated_name ? cols[j]->alias() : ifp->name.str); sc->alias(ifp->is_autogenerated_name() ? cols[j]->alias() : ifp->name.str);
sc->tableName(csep->derivedTbAlias()); sc->tableName(csep->derivedTbAlias());
sc->colPosition(j); sc->colPosition(j);
string tableAlias(csep->derivedTbAlias()); string tableAlias(csep->derivedTbAlias());
@ -6677,7 +6677,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
ifp->print(&str, QT_ORDINARY); ifp->print(&str, QT_ORDINARY);
fullname = str.c_ptr(); fullname = str.c_ptr();
if (ifp->is_autogenerated_name) // no alias if (ifp->is_autogenerated_name()) // no alias
{ {
sc->alias(fullname); sc->alias(fullname);
} }
@ -7281,7 +7281,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex,
gwi.groupByCols.push_back(srcp); gwi.groupByCols.push_back(srcp);
continue; continue;
} }
else if (!groupItem->is_autogenerated_name) // alias else if (!groupItem->is_autogenerated_name()) // alias
{ {
uint32_t i = 0; uint32_t i = 0;
@ -8690,7 +8690,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
ifp->print(&str, QT_ORDINARY); ifp->print(&str, QT_ORDINARY);
fullname = str.c_ptr(); fullname = str.c_ptr();
if (ifp->is_autogenerated_name) // no alias if (ifp->is_autogenerated_name()) // no alias
{ {
sc->alias(fullname); sc->alias(fullname);
} }
@ -9288,7 +9288,7 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro
gwi.groupByCols.push_back(srcp); gwi.groupByCols.push_back(srcp);
continue; continue;
} }
else if (!groupItem->is_autogenerated_name) // alias else if (!groupItem->is_autogenerated_name()) // alias
{ {
uint32_t i = 0; uint32_t i = 0;

4
dbcon/mysql/sm.cpp
View File

@ -553,7 +553,7 @@ MYSQL_RES* mysql_use_result(MYSQL* mysql)
DBUG_RETURN(0); DBUG_RETURN(0);
} }
if (!(result = (MYSQL_RES*) my_malloc(sizeof(*result) + if (!(result = (MYSQL_RES*) my_malloc(PSI_NOT_INSTRUMENTED, sizeof(*result) +
sizeof(ulong) * mysql->field_count, sizeof(ulong) * mysql->field_count,
MYF(MY_WME | MY_ZEROFILL)))) MYF(MY_WME | MY_ZEROFILL))))
DBUG_RETURN(0); DBUG_RETURN(0);
@ -562,7 +562,7 @@ MYSQL_RES* mysql_use_result(MYSQL* mysql)
result->methods = mysql->methods; result->methods = mysql->methods;
if (!(result->row = (MYSQL_ROW) if (!(result->row = (MYSQL_ROW)
my_malloc(sizeof(result->row[0]) * (mysql->field_count + 1), MYF(MY_WME)))) my_malloc(PSI_NOT_INSTRUMENTED, sizeof(result->row[0]) * (mysql->field_count + 1), MYF(MY_WME))))
{ {
/* Ptrs: to one row */ /* Ptrs: to one row */
my_free(result); my_free(result);