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: 1-row partition rotation fix [fixes #260]

Browse Source
This commit is contained in:
Aleksey Midenkov
2017-09-13 10:57:23 +03:00
parent 78d2430aa2
commit 7e764ae188
7 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/my_base.h
View File

@@ -407,6 +407,10 @@ enum ha_base_keytype {
when only HA_STATUS_VARIABLE but it won't be used. when only HA_STATUS_VARIABLE but it won't be used.
*/ */
#define HA_STATUS_VARIABLE_EXTRA 128U #define HA_STATUS_VARIABLE_EXTRA 128U
/*
Treat empty table as empty (ignore HA_STATUS_TIME hack).
*/
#define HA_STATUS_OPEN 256U
/* /*
Errorcodes given by handler functions Errorcodes given by handler functions

6
mysql-test/suite/versioning/r/partition.result
View File

@@ -159,6 +159,12 @@ x
2 2
create or replace table t1 (x int) create or replace table t1 (x int)
with system versioning with system versioning
partition by system_time limit 1 (
partition p0 versioning,
partition pn as of now);
alter table t1 change x big int;
create or replace table t1 (x int)
with system versioning
partition by system_time ( partition by system_time (
partition p0 versioning, partition p0 versioning,
partition pn as of now); partition pn as of now);

8
mysql-test/suite/versioning/t/partition.test
View File

@@ -89,6 +89,14 @@ alter table t1 drop partition p0;
select x from t1; select x from t1;
# Bug #260: incorrect IB partitioning warning
create or replace table t1 (x int)
with system versioning
partition by system_time limit 1 (
partition p0 versioning,
partition pn as of now);
alter table t1 change x big int;
# insert, delete, update # insert, delete, update
create or replace table t1 (x int) create or replace table t1 (x int)
with system versioning with system versioning

15
sql/ha_partition.cc
View File

@@ -3550,7 +3550,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked)
m_part_info->part_expr->get_monotonicity_info(); m_part_info->part_expr->get_monotonicity_info();
else if (m_part_info->list_of_part_fields) else if (m_part_info->list_of_part_fields)
m_part_func_monotonicity_info= MONOTONIC_STRICT_INCREASING; m_part_func_monotonicity_info= MONOTONIC_STRICT_INCREASING;
info(HA_STATUS_VARIABLE | HA_STATUS_CONST); info(HA_STATUS_OPEN | HA_STATUS_VARIABLE | HA_STATUS_CONST);
DBUG_RETURN(0); DBUG_RETURN(0);
err_handler: err_handler:
@@ -6550,6 +6550,7 @@ int ha_partition::info(uint flag)
{ {
uint no_lock_flag= flag & HA_STATUS_NO_LOCK; uint no_lock_flag= flag & HA_STATUS_NO_LOCK;
uint extra_var_flag= flag & HA_STATUS_VARIABLE_EXTRA; uint extra_var_flag= flag & HA_STATUS_VARIABLE_EXTRA;
uint open_flag= flag & HA_STATUS_OPEN;
DBUG_ENTER("ha_partition::info"); DBUG_ENTER("ha_partition::info");
#ifndef DBUG_OFF #ifndef DBUG_OFF
@@ -6590,7 +6591,7 @@ int ha_partition::info(uint flag)
do do
{ {
file= *file_array; file= *file_array;
file->info(HA_STATUS_AUTO | no_lock_flag); file->info(HA_STATUS_AUTO | no_lock_flag | open_flag);
set_if_bigger(auto_increment_value, set_if_bigger(auto_increment_value,
file->stats.auto_increment_value); file->stats.auto_increment_value);
} while (*(++file_array)); } while (*(++file_array));
@@ -6644,7 +6645,7 @@ int ha_partition::info(uint flag)
i= bitmap_get_next_set(&m_part_info->read_partitions, i)) i= bitmap_get_next_set(&m_part_info->read_partitions, i))
{ {
file= m_file[i]; file= m_file[i];
file->info(HA_STATUS_VARIABLE | no_lock_flag | extra_var_flag); file->info(HA_STATUS_VARIABLE | no_lock_flag | extra_var_flag | open_flag);
stats.records+= file->stats.records; stats.records+= file->stats.records;
stats.deleted+= file->stats.deleted; stats.deleted+= file->stats.deleted;
stats.data_file_length+= file->stats.data_file_length; stats.data_file_length+= file->stats.data_file_length;
@@ -6725,7 +6726,7 @@ int ha_partition::info(uint flag)
if (!(flag & HA_STATUS_VARIABLE) || if (!(flag & HA_STATUS_VARIABLE) ||
!bitmap_is_set(&(m_part_info->read_partitions), !bitmap_is_set(&(m_part_info->read_partitions),
(file_array - m_file))) (file_array - m_file)))
file->info(HA_STATUS_VARIABLE | no_lock_flag | extra_var_flag); file->info(HA_STATUS_VARIABLE | no_lock_flag | extra_var_flag | open_flag);
if (file->stats.records > max_records) if (file->stats.records > max_records)
{ {
max_records= file->stats.records; max_records= file->stats.records;
@@ -6744,7 +6745,7 @@ int ha_partition::info(uint flag)
this); this);
file= m_file[handler_instance]; file= m_file[handler_instance];
file->info(HA_STATUS_CONST | no_lock_flag); file->info(HA_STATUS_CONST | no_lock_flag | open_flag);
stats.block_size= file->stats.block_size; stats.block_size= file->stats.block_size;
stats.create_time= file->stats.create_time; stats.create_time= file->stats.create_time;
ref_length= m_ref_length; ref_length= m_ref_length;
@@ -6760,7 +6761,7 @@ int ha_partition::info(uint flag)
Note: all engines does not support HA_STATUS_ERRKEY, so set errkey. Note: all engines does not support HA_STATUS_ERRKEY, so set errkey.
*/ */
file->errkey= errkey; file->errkey= errkey;
file->info(HA_STATUS_ERRKEY | no_lock_flag); file->info(HA_STATUS_ERRKEY | no_lock_flag | open_flag);
errkey= file->errkey; errkey= file->errkey;
} }
if (flag & HA_STATUS_TIME) if (flag & HA_STATUS_TIME)
@@ -6777,7 +6778,7 @@ int ha_partition::info(uint flag)
do do
{ {
file= *file_array; file= *file_array;
file->info(HA_STATUS_TIME | no_lock_flag); file->info(HA_STATUS_TIME | no_lock_flag | open_flag);
if (file->stats.update_time > stats.update_time) if (file->stats.update_time > stats.update_time)
stats.update_time= file->stats.update_time; stats.update_time= file->stats.update_time;
} while (*(++file_array)); } while (*(++file_array));

2
sql/ha_partition.h
View File

@@ -1368,7 +1368,7 @@ public:
{ {
handler *file= m_file[part_id]; handler *file= m_file[part_id];
DBUG_ASSERT(bitmap_is_set(&(m_part_info->read_partitions), part_id)); DBUG_ASSERT(bitmap_is_set(&(m_part_info->read_partitions), part_id));
file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); file->info(HA_STATUS_OPEN | HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
part_recs+= file->stats.records; part_recs+= file->stats.records;
} }
return part_recs; return part_recs;

22
sql/sql_partition.cc
View File

@@ -3426,11 +3426,21 @@ int vers_get_partition_id(partition_info *part_info,
DBUG_ASSERT(part_info); DBUG_ASSERT(part_info);
Field *sys_trx_end= part_info->part_field_array[STAT_TRX_END]; Field *sys_trx_end= part_info->part_field_array[STAT_TRX_END];
DBUG_ASSERT(sys_trx_end); DBUG_ASSERT(sys_trx_end);
DBUG_ASSERT(part_info->table); TABLE *table= part_info->table;
DBUG_ASSERT(table);
Vers_part_info *vers_info= part_info->vers_info; Vers_part_info *vers_info= part_info->vers_info;
DBUG_ASSERT(vers_info && vers_info->initialized()); DBUG_ASSERT(vers_info);
DBUG_ASSERT(sys_trx_end->table == part_info->table && part_info->table->versioned()); DBUG_ASSERT(vers_info->initialized());
DBUG_ASSERT(part_info->table->vers_end_field() == sys_trx_end); DBUG_ASSERT(sys_trx_end->table == table);
bool tmp_off= false;
if (!table->versioned() && table->file->native_versioned())
{
// in copy_data_between_tables() versioning may be temporarily turned off
tmp_off= true;
table->s->versioned= true;
}
DBUG_ASSERT(table->versioned());
DBUG_ASSERT(table->vers_end_field() == sys_trx_end);
// new rows have NULL in sys_trx_end // new rows have NULL in sys_trx_end
if (sys_trx_end->is_max() || sys_trx_end->is_null()) if (sys_trx_end->is_max() || sys_trx_end->is_null())
@@ -3440,7 +3450,6 @@ int vers_get_partition_id(partition_info *part_info,
else // row is historical else // row is historical
{ {
THD *thd= current_thd; THD *thd= current_thd;
TABLE *table= part_info->table;
switch (thd->lex->sql_command) switch (thd->lex->sql_command)
{ {
@@ -3478,6 +3487,9 @@ int vers_get_partition_id(partition_info *part_info,
*part_id= vers_info->hist_part->id; *part_id= vers_info->hist_part->id;
} }
if (tmp_off)
table->s->versioned= false;
DBUG_PRINT("exit",("partition: %d", *part_id)); DBUG_PRINT("exit",("partition: %d", *part_id));
DBUG_RETURN(0); DBUG_RETURN(0);
} }

4
storage/innobase/handler/ha_innodb.cc
View File

@@ -6862,7 +6862,7 @@ ha_innobase::open(
} }
} }
info(HA_STATUS_NO_LOCK | HA_STATUS_VARIABLE | HA_STATUS_CONST); info(HA_STATUS_OPEN | HA_STATUS_NO_LOCK | HA_STATUS_VARIABLE | HA_STATUS_CONST);
DBUG_RETURN(0); DBUG_RETURN(0);
} }
@@ -14958,7 +14958,7 @@ ha_innobase::info_low(
set. That way SHOW TABLE STATUS will show the best estimate, set. That way SHOW TABLE STATUS will show the best estimate,
while the optimizer never sees the table empty. */ while the optimizer never sees the table empty. */
if (n_rows == 0 && !(flag & HA_STATUS_TIME)) { if (n_rows == 0 && !(flag & (HA_STATUS_TIME | HA_STATUS_OPEN))) {
n_rows++; n_rows++;
} }