database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

SQL: recursive CTE inner derived vers_conditions [fix #385]

Browse Source
This commit is contained in:
Aleksey Midenkov
2017-12-13 15:31:46 +03:00
parent 22f45062de
commit bc4a86699d
6 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysql-test/suite/versioning/r/cte.result
View File

@@ -91,6 +91,23 @@ insert addr values (1, 'Moscow'), (2, 'New York'), (3, 'London');
set @ts=now(6); set @ts=now(6);
delete from emp; delete from emp;
delete from addr; delete from addr;
with recursive
ancestors
as
(
select e.emp_id, e.name, e.mgr
from emp for system_time as of timestamp @ts as e
where name = 'bill'
union
select ee.emp_id, ee.name, ee.mgr
from emp for system_time as of timestamp @ts as ee, ancestors as a
where ee.mgr = a.emp_id
)
select * from ancestors;
emp_id name mgr
1 bill 0
2 bill 1
3 kate 1
insert emp values (4, 'john', 1); insert emp values (4, 'john', 1);
insert addr values (4, 'Paris'); insert addr values (4, 'Paris');
with ancestors as (select * from emp natural join addr) select * from ancestors; with ancestors as (select * from emp natural join addr) select * from ancestors;

15
mysql-test/suite/versioning/t/cte.test
View File

@@ -90,6 +90,21 @@ insert addr values (1, 'Moscow'), (2, 'New York'), (3, 'London');
set @ts=now(6); set @ts=now(6);
delete from emp; delete from emp;
delete from addr; delete from addr;
with recursive
ancestors
as
(
select e.emp_id, e.name, e.mgr
from emp for system_time as of timestamp @ts as e
where name = 'bill'
union
select ee.emp_id, ee.name, ee.mgr
from emp for system_time as of timestamp @ts as ee, ancestors as a
where ee.mgr = a.emp_id
)
select * from ancestors;
insert emp values (4, 'john', 1); insert emp values (4, 'john', 1);
insert addr values (4, 'Paris'); insert addr values (4, 'Paris');
with ancestors as (select * from emp natural join addr) select * from ancestors; with ancestors as (select * from emp natural join addr) select * from ancestors;

2
sql/sql_derived.cc
View File

@@ -850,8 +850,6 @@ expli_table_err:
{ {
sl->vers_export_outer= impli_table->vers_conditions; sl->vers_export_outer= impli_table->vers_conditions;
} }
else
sl->vers_import_outer= true; // FIXME: is needed?
} }
} // if (sl->table_list.elements > 0) } // if (sl->table_list.elements > 0)
// System Versioning end // System Versioning end

1
sql/sql_lex.cc
View File

@@ -2313,7 +2313,6 @@ void st_select_lex::init_select()
in_tvc= false; in_tvc= false;
vers_saved_where= NULL; vers_saved_where= NULL;
vers_export_outer.empty(); vers_export_outer.empty();
vers_import_outer= false;
versioned_tables= 0; versioned_tables= 0;
} }

1
sql/sql_lex.h
View File

@@ -1049,7 +1049,6 @@ private:
Item *vers_saved_where; Item *vers_saved_where;
public: public:
vers_select_conds_t vers_export_outer; vers_select_conds_t vers_export_outer;
bool vers_import_outer;
uint versioned_tables; uint versioned_tables;
int vers_setup_conds(THD *thd, TABLE_LIST *tables, COND **where_expr); int vers_setup_conds(THD *thd, TABLE_LIST *tables, COND **where_expr);
/* push new Item_field into item_list */ /* push new Item_field into item_list */

24
sql/sql_select.cc
View File

@@ -829,19 +829,27 @@ int SELECT_LEX::vers_setup_conds(THD *thd, TABLE_LIST *tables, COND **where_expr
vers_select_conds_t &vers_conditions= table->vers_conditions; vers_select_conds_t &vers_conditions= table->vers_conditions;
// propagate system_time from nearest outer SELECT_LEX // propagate system_time from nearest outer SELECT_LEX
if (!vers_conditions && outer_slex && vers_import_outer) if (!vers_conditions && outer_slex)
{ {
TABLE_LIST* derived= master_unit()->derived; TABLE_LIST* derived= master_unit()->derived;
// inner SELECT may not be a derived table (derived == NULL) if (derived == table && vers_export_outer) // recursive CTE
while (derived && outer_slex && (!derived->vers_conditions || derived->vers_conditions.from_inner))
{ {
derived= outer_slex->master_unit()->derived; vers_conditions= vers_export_outer;
outer_slex= outer_slex->next_select_in_list();
} }
if (derived && outer_slex && !derived->vers_conditions.from_inner) else
{ {
DBUG_ASSERT(derived->vers_conditions); // inner SELECT may not be a derived table (derived == NULL)
vers_conditions= derived->vers_conditions; while (derived && outer_slex &&
(!derived->vers_conditions || derived->vers_conditions.from_inner))
{
derived= outer_slex->master_unit()->derived;
outer_slex= outer_slex->next_select_in_list();
}
if (derived && outer_slex && !derived->vers_conditions.from_inner)
{
DBUG_ASSERT(derived->vers_conditions);
vers_conditions= derived->vers_conditions;
}
} }
} }