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-2178 Cleanup of MIGR:: singleton from the plugin code.

Browse Source 
Disable SP execution by the smart handlers for now.

    Add session variables to Enable/Disable select/derived/group_by
    handlers. Defaulted to Enable.
This commit is contained in:
Gagan Goel
2019-08-04 21:50:50 -04:00
parent d62b66ecf7
commit 1c460f3ba5
11 changed files with 284 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
dbcon/mysql/ha_mcs_pushdown.cpp
View File

@ -148,15 +148,20 @@ static group_by_handler*
create_calpont_group_by_handler(THD* thd, Query* query)
{
ha_calpont_group_by_handler* handler = NULL;
// MCOL-2178 Disable SP support in the group_by_handler for now
// Check the session variable value to enable/disable use of
// group_by_handler
if (!get_group_by_handler(thd) || (thd->lex)->sphead)
{
return handler;
}
// same as thd->lex->current_select
SELECT_LEX *select_lex = query->from->select_lex;
// Create a handler if query is valid. See comments for details.
if //( MIGR::infinidb_vtable.vtable_state == MIGR::INFINIDB_DISABLE_VTABLE
// WIP MCOL-2178
//&& ( MIGR::infinidb_vtable_mode == 0
// || MIGR::infinidb_vtable_mode == 2 )
( query->group_by || select_lex->with_sum_func ) //)
if ( query->group_by || select_lex->with_sum_func )
{
bool unsupported_feature = false;
// revisit SELECT_LEX for all units
@ -234,6 +239,14 @@ create_columnstore_derived_handler(THD* thd, TABLE_LIST *derived)
{
ha_columnstore_derived_handler* handler = NULL;
// MCOL-2178 Disable SP support in the derived_handler for now
// Check the session variable value to enable/disable use of
// derived_handler
if (!get_derived_handler(thd) || (thd->lex)->sphead)
{
return handler;
}
SELECT_LEX_UNIT *unit= derived->derived;
bool unsupported_feature = false;
@ -287,8 +300,6 @@ ha_columnstore_derived_handler::~ha_columnstore_derived_handler()
/***********************************************************
* DESCRIPTION:
* Execute the query and saves derived table query.
* ATM this function sets vtable_state and restores it afterwards
* since it reuses existed vtable code internally.
* PARAMETERS:
*
* RETURN:
@ -305,16 +316,10 @@ int ha_columnstore_derived_handler::init_scan()
derived_query.length(0);
derived->derived->print(&derived_query, QT_ORDINARY);
// Save vtable_state to restore the after we inited.
MIGR::infinidb_state oldState = MIGR::infinidb_vtable.vtable_state;
MIGR::infinidb_vtable.vtable_state = MIGR::INFINIDB_CREATE_VTABLE;
mcs_handler_info mhi = mcs_handler_info(static_cast<void*>(this), DERIVED);
// this::table is the place for the result set
int rc = ha_cs_impl_pushdown_init(&mhi, table);
MIGR::infinidb_vtable.vtable_state = oldState;
DBUG_RETURN(rc);
}
@ -322,8 +327,6 @@ int ha_columnstore_derived_handler::init_scan()
/***********************************************************
* DESCRIPTION:
* Fetches next row and saves it in the temp table
* ATM this function sets vtable_state and restores it
* afterwards since it reuses existed vtable code internally.
* PARAMETERS:
*
* RETURN:
@ -334,15 +337,8 @@ int ha_columnstore_derived_handler::next_row()
{
DBUG_ENTER("ha_columnstore_derived_handler::next_row");
// Save vtable_state to restore the after we inited.
MIGR::infinidb_state oldState = MIGR::infinidb_vtable.vtable_state;
MIGR::infinidb_vtable.vtable_state = MIGR::INFINIDB_CREATE_VTABLE;
int rc = ha_calpont_impl_rnd_next(table->record[0], table);
MIGR::infinidb_vtable.vtable_state = oldState;
DBUG_RETURN(rc);
}
@ -350,8 +346,6 @@ int ha_columnstore_derived_handler::next_row()
/***********************************************************
* DESCRIPTION:
* Finishes the scan for derived handler
* ATM this function sets vtable_state and restores it
* afterwards since it reuses existed vtable code internally.
* PARAMETERS:
*
* RETURN:
@ -362,13 +356,8 @@ int ha_columnstore_derived_handler::end_scan()
{
DBUG_ENTER("ha_columnstore_derived_handler::end_scan");
MIGR::infinidb_state oldState = MIGR::infinidb_vtable.vtable_state;
MIGR::infinidb_vtable.vtable_state = MIGR::INFINIDB_SELECT_VTABLE;
int rc = ha_calpont_impl_rnd_end(table, true);
MIGR::infinidb_vtable.vtable_state = oldState;
DBUG_RETURN(rc);
}
@ -413,12 +402,7 @@ int ha_calpont_group_by_handler::init_scan()
{
DBUG_ENTER("ha_calpont_group_by_handler::init_scan");
// Save vtable_state to restore the after we inited.
MIGR::infinidb_state oldState = MIGR::infinidb_vtable.vtable_state;
// MCOL-1052 Should be removed after cleaning the code up.
MIGR::infinidb_vtable.vtable_state = MIGR::INFINIDB_CREATE_VTABLE;
int rc = ha_calpont_impl_group_by_init(this, table);
MIGR::infinidb_vtable.vtable_state = oldState;
DBUG_RETURN(rc);
}
@ -470,6 +454,14 @@ create_columnstore_select_handler(THD* thd, SELECT_LEX* select_lex)
{
ha_columnstore_select_handler* handler = NULL;
// MCOL-2178 Disable SP support in the select_handler for now.
// Check the session variable value to enable/disable use of
// select_handler
if (!get_select_handler(thd) || (thd->lex)->sphead)
{
return handler;
}
bool unsupported_feature = false;
// Select_handler use the short-cut that effectively disables
// INSERT..SELECT and LDI
@ -563,8 +555,6 @@ ha_columnstore_select_handler::~ha_columnstore_select_handler()
/***********************************************************
* DESCRIPTION:
* Execute the query and saves select table query.
* ATM this function sets vtable_state and restores it afterwards
* since it reuses existed vtable code internally.
* PARAMETERS:
*
* RETURN:
@ -581,16 +571,10 @@ int ha_columnstore_select_handler::init_scan()
select_query.length(0);
select->print(thd, &select_query, QT_ORDINARY);
// Save vtable_state to restore the after we inited.
MIGR::infinidb_state oldState = MIGR::infinidb_vtable.vtable_state;
MIGR::infinidb_vtable.vtable_state = MIGR::INFINIDB_CREATE_VTABLE;
mcs_handler_info mhi = mcs_handler_info(static_cast<void*>(this), SELECT);
// this::table is the place for the result set
int rc = ha_cs_impl_pushdown_init(&mhi, table);
MIGR::infinidb_vtable.vtable_state = oldState;
DBUG_RETURN(rc);
}
@ -598,8 +582,6 @@ int ha_columnstore_select_handler::init_scan()
/***********************************************************
* DESCRIPTION:
* Fetches next row and saves it in the temp table
* ATM this function sets vtable_state and restores it
* afterwards since it reuses existed vtable code internally.
* PARAMETERS:
*
* RETURN:
@ -610,15 +592,8 @@ int ha_columnstore_select_handler::next_row()
{
DBUG_ENTER("ha_columnstore_select_handler::next_row");
// Save vtable_state to restore the after we inited.
MIGR::infinidb_state oldState = MIGR::infinidb_vtable.vtable_state;
MIGR::infinidb_vtable.vtable_state = MIGR::INFINIDB_CREATE_VTABLE;
int rc = ha_calpont_impl_rnd_next(table->record[0], table);
MIGR::infinidb_vtable.vtable_state = oldState;
DBUG_RETURN(rc);
}
@ -626,8 +601,6 @@ int ha_columnstore_select_handler::next_row()
/***********************************************************
* DESCRIPTION:
* Finishes the scan for select handler
* ATM this function sets vtable_state and restores it
* afterwards since it reuses existed vtable code internally.
* PARAMETERS:
*
* RETURN:
@ -638,13 +611,8 @@ int ha_columnstore_select_handler::end_scan()
{
DBUG_ENTER("ha_columnstore_select_handler::end_scan");
MIGR::infinidb_state oldState = MIGR::infinidb_vtable.vtable_state;
MIGR::infinidb_vtable.vtable_state = MIGR::INFINIDB_SELECT_VTABLE;
int rc = ha_calpont_impl_rnd_end(table, true);
MIGR::infinidb_vtable.vtable_state = oldState;
DBUG_RETURN(rc);
}