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

SQL: Truncate history of partitioned table [fixes #399, closes #403]

Browse Source 
also, don't rotate versioning partitions for DELETE HISTORY

originally by: Aleksey Midenkov
This commit is contained in:
Sergei Golubchik
2018-02-15 17:13:48 +01:00
parent 187a163c78
commit 9f6a7ed2d7
5 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/suite/versioning/r/truncate.result
View File

@ -45,15 +45,24 @@ call truncate_sp;
select * from t for system_time all;
a
drop procedure truncate_sp;
### Issue #399, truncate partitioned table is now unimplemented
# Truncate partitioned
create or replace table t (a int)
with system versioning
engine myisam
partition by system_time (
partition by system_time limit 1 (
partition p0 history,
partition p1 history,
partition pn current);
insert into t values (1);
update t set a= 2;
update t set a= 3;
Warnings:
Note 4114 Versioned table `test`.`t`: switching from partition `p0` to `p1`
delete history from t;
ERROR 42000: The used command is not allowed with this MariaDB version
select * from t for system_time all;
a
3
# VIEW
create or replace table t (i int) with system versioning;
delete history from t;
create or replace view v as select * from t;

13
mysql-test/suite/versioning/t/truncate.test
View File

@ -41,18 +41,21 @@ select * from t for system_time all;
drop procedure truncate_sp;
--echo ### Issue #399, truncate partitioned table is now unimplemented
--echo # Truncate partitioned
create or replace table t (a int)
with system versioning
engine myisam
partition by system_time (
partition by system_time limit 1 (
partition p0 history,
partition p1 history,
partition pn current);
--error ER_NOT_ALLOWED_COMMAND
insert into t values (1);
update t set a= 2;
update t set a= 3;
delete history from t;
select * from t for system_time all;
--echo # VIEW
create or replace table t (i int) with system versioning;
delete history from t;
create or replace view v as select * from t;

15
sql/ha_partition.cc
View File

@ -4474,11 +4474,18 @@ int ha_partition::delete_row(const uchar *buf)
Notice that HA_READ_BEFORE_WRITE_REMOVAL does not require this protocol,
so this is not supported for this engine.
For partitions by system_time, get_part_for_buf() is always either current
or last historical partition, but DELETE HISTORY can delete from any
historical partition. So, skip the check in this case.
*/
uint32 part_id;
error= get_part_for_buf(buf, m_rec0, m_part_info, &part_id);
DBUG_ASSERT(!error);
DBUG_ASSERT(part_id == m_last_part);
if (!thd->lex->vers_conditions) // if not DELETE HISTORY
{
uint32 part_id;
error= get_part_for_buf(buf, m_rec0, m_part_info, &part_id);
DBUG_ASSERT(!error);
DBUG_ASSERT(part_id == m_last_part);
}
DBUG_ASSERT(bitmap_is_set(&(m_part_info->read_partitions), m_last_part));
DBUG_ASSERT(bitmap_is_set(&(m_part_info->lock_partitions), m_last_part));
#endif

8
sql/sql_delete.cc
View File

@ -317,14 +317,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
TABLE *table= table_list->table;
DBUG_ASSERT(table);
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (table->part_info)
{
my_error(ER_NOT_ALLOWED_COMMAND, MYF(0));
DBUG_RETURN(true);
}
#endif
DBUG_ASSERT(!conds || thd->stmt_arena->is_stmt_execute());
if (select_lex->vers_setup_conds(thd, table_list, &conds))
DBUG_RETURN(TRUE);

2
sql/sql_partition.cc
View File

@ -3112,6 +3112,8 @@ int vers_get_partition_id(partition_info *part_info,
switch (thd->lex->sql_command)
{
case SQLCOM_DELETE:
if (thd->lex->vers_conditions)
break; // DELETE HISTORY
case SQLCOM_DELETE_MULTI:
case SQLCOM_UPDATE:
case SQLCOM_UPDATE_MULTI: