Commit 670b7f5f authored by Aleksey Midenkov's avatar Aleksey Midenkov

Style: API renames

part_recs_slow() -> part_records();
HTON_SUPPORTS_SYS_VERSIONING -> HTON_NATIVE_SYS_VERSIONING.
parent 2442a81e
......@@ -1360,7 +1360,7 @@ class ha_partition :public handler
return m_innodb;
}
virtual ha_rows part_recs_slow(void *_part_elem)
virtual ha_rows part_records(void *_part_elem)
{
partition_element *part_elem= reinterpret_cast<partition_element *>(_part_elem);
DBUG_ASSERT(m_part_info);
......
......@@ -6674,7 +6674,7 @@ bool Vers_parse_info::check_and_fix_implicit(
const char* table_name)
{
bool integer_fields=
create_info->db_type->flags & HTON_SUPPORTS_SYS_VERSIONING;
create_info->db_type->flags & HTON_NATIVE_SYS_VERSIONING;
SELECT_LEX &slex= thd->lex->select_lex;
int vers_tables= 0;
......@@ -6826,7 +6826,7 @@ bool Vers_parse_info::check_and_fix_alter(THD *thd, Alter_info *alter_info,
TABLE_SHARE *share)
{
bool integer_fields=
create_info->db_type->flags & HTON_SUPPORTS_SYS_VERSIONING;
create_info->db_type->flags & HTON_NATIVE_SYS_VERSIONING;
const char *table_name= share->table_name.str;
if (!need_check() && !share->versioned)
......
......@@ -1442,7 +1442,7 @@ handlerton *ha_default_tmp_handlerton(THD *thd);
*/
#define HTON_NO_BINLOG_ROW_OPT (1 << 9)
#define HTON_SUPPORTS_EXTENDED_KEYS (1 <<10) //supports extended keys
#define HTON_SUPPORTS_SYS_VERSIONING (1 << 11) //Engine supports System Versioning
#define HTON_NATIVE_SYS_VERSIONING (1 << 11) //Engine supports System Versioning
// MySQL compatibility. Unused.
#define HTON_SUPPORTS_FOREIGN_KEYS (1 << 0) //Foreign key constraint supported.
......@@ -4368,8 +4368,8 @@ class handler :public Sql_alloc
{ return -1; /*unsupported */}
virtual bool versioned() const
{ DBUG_ASSERT(ht); return partition_ht()->flags & HTON_SUPPORTS_SYS_VERSIONING; }
virtual ha_rows part_recs_slow(void *_part_elem)
{ DBUG_ASSERT(ht); return partition_ht()->flags & HTON_NATIVE_SYS_VERSIONING; }
virtual ha_rows part_records(void *_part_elem)
{ DBUG_ASSERT(0); return false; }
virtual handler* part_handler(uint32 part_id)
{ DBUG_ASSERT(0); return NULL; }
......
......@@ -71,7 +71,7 @@ VTQ_common<Item_func_X>::init_hton()
hton= plugin_hton(plugin_int_to_ref(innodb_plugin));
DBUG_ASSERT(hton);
}
if (hton && !(hton->flags & HTON_SUPPORTS_SYS_VERSIONING))
if (hton && !(hton->flags & HTON_NATIVE_SYS_VERSIONING))
{
my_error(ER_VERS_ENGINE_UNSUPPORTED, MYF(0), Item::name ? Item::name : this->func_name());
hton= NULL;
......
......@@ -476,7 +476,7 @@ class partition_info : public Sql_alloc
part= vers_hist_part();
}
// TODO: cache thread-shared part_recs and increment on INSERT
return table->file->part_recs_slow(part) >= vers_info->limit;
return table->file->part_records(part) >= vers_info->limit;
}
Vers_field_stats& vers_stat_trx(stat_trx_field fld, uint32 part_element_id)
{
......
......@@ -3859,7 +3859,7 @@ innobase_init(
innobase_hton->flush_logs = innobase_flush_logs;
innobase_hton->show_status = innobase_show_status;
innobase_hton->flags =
HTON_SUPPORTS_EXTENDED_KEYS | HTON_SUPPORTS_FOREIGN_KEYS | HTON_SUPPORTS_SYS_VERSIONING;
HTON_SUPPORTS_EXTENDED_KEYS | HTON_SUPPORTS_FOREIGN_KEYS | HTON_NATIVE_SYS_VERSIONING;
innobase_hton->release_temporary_latches =
innobase_release_temporary_latches;
......
......@@ -3045,7 +3045,7 @@ ha_innopart::records()
}
ha_rows
ha_innopart::part_recs_slow(void *_part_elem)
ha_innopart::part_records(void *_part_elem)
{
partition_element *part_elem= reinterpret_cast<partition_element *>(_part_elem);
DBUG_ASSERT(m_part_info);
......
......@@ -1356,7 +1356,7 @@ class ha_innopart:
}
virtual ha_rows
part_recs_slow(void *_part_elem);
part_records(void *_part_elem);
private:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment