database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed numerous problems for mutually recursive CTE.

Browse Source 
Actually mutually recursive CTE were not functional. Now the code
for mutually recursive CTE looks like functional, but still needs
re-writing.
Added many new test cases for mutually recursive CTE.
This commit is contained in:
Igor Babaev
2016-06-06 10:01:16 -07:00
parent 6c6c3af6aa
commit 0a6e6d705b
8 changed files with 653 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_derived.cc
View File

@ -661,7 +661,10 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived)
derived->derived_result->set_unit(unit);
derived->table= derived->derived_result->table;
if (derived->is_with_table_recursive_reference())
{
unit->with_element->rec_result->rec_tables.push_back(derived->table);
derived->table->is_rec_table= true;
}
}
DBUG_ASSERT(derived->table || res);
goto exit;
@ -945,9 +948,10 @@ bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived)
{
DBUG_ENTER("mysql_derived_fill");
SELECT_LEX_UNIT *unit= derived->get_unit();
bool derived_is_recursive= derived->is_recursive_with_table();
bool res= FALSE;
if (derived->is_recursive_with_table() && unit->executed)
if (derived_is_recursive && derived->with->all_are_stabilized())
{
TABLE *src= unit->with_element->rec_result->table;
TABLE *dest= derived->table;
@ -955,17 +959,18 @@ bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived)
DBUG_RETURN(res);
}
if (unit->executed && !unit->uncacheable && !unit->describe)
if (unit->executed && !unit->uncacheable && !unit->describe &&
!derived_is_recursive)
DBUG_RETURN(FALSE);
/*check that table creation passed without problems. */
DBUG_ASSERT(derived->table && derived->table->is_created());
SELECT_LEX *first_select= unit->first_select();
select_union *derived_result= derived->derived_result;
SELECT_LEX *save_current_select= lex->current_select;
if (unit->is_union())
if (unit->is_union() || derived_is_recursive)
{
// execute union without clean up
if (derived->is_recursive_with_table())
if (derived_is_recursive)
unit->with_element->set_result_table(derived->table);
res= unit->exec();
}