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

Style: API renames

Browse Source 
part_recs_slow() -> part_records();
HTON_SUPPORTS_SYS_VERSIONING -> HTON_NATIVE_SYS_VERSIONING.
This commit is contained in:
Aleksey Midenkov
2017-06-22 20:15:03 +03:00
parent 2442a81eff
commit 670b7f5fd4
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/ha_partition.h
View File

@ -1360,7 +1360,7 @@ public:
return m_innodb; 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); partition_element *part_elem= reinterpret_cast<partition_element *>(_part_elem);
DBUG_ASSERT(m_part_info); DBUG_ASSERT(m_part_info);

4
sql/handler.cc
View File

@ -6674,7 +6674,7 @@ bool Vers_parse_info::check_and_fix_implicit(
const char* table_name) const char* table_name)
{ {
bool integer_fields= 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; SELECT_LEX &slex= thd->lex->select_lex;
int vers_tables= 0; 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) TABLE_SHARE *share)
{ {
bool integer_fields= 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; const char *table_name= share->table_name.str;
if (!need_check() && !share->versioned) if (!need_check() && !share->versioned)

6
sql/handler.h
View File

@ -1442,7 +1442,7 @@ handlerton *ha_default_tmp_handlerton(THD *thd);
*/ */
#define HTON_NO_BINLOG_ROW_OPT (1 << 9) #define HTON_NO_BINLOG_ROW_OPT (1 << 9)
#define HTON_SUPPORTS_EXTENDED_KEYS (1 <<10) //supports extended keys #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. // MySQL compatibility. Unused.
#define HTON_SUPPORTS_FOREIGN_KEYS (1 << 0) //Foreign key constraint supported. #define HTON_SUPPORTS_FOREIGN_KEYS (1 << 0) //Foreign key constraint supported.
@ -4368,8 +4368,8 @@ public:
{ return -1; /*unsupported */} { return -1; /*unsupported */}
virtual bool versioned() const virtual bool versioned() const
{ DBUG_ASSERT(ht); return partition_ht()->flags & HTON_SUPPORTS_SYS_VERSIONING; } { DBUG_ASSERT(ht); return partition_ht()->flags & HTON_NATIVE_SYS_VERSIONING; }
virtual ha_rows part_recs_slow(void *_part_elem) virtual ha_rows part_records(void *_part_elem)
{ DBUG_ASSERT(0); return false; } { DBUG_ASSERT(0); return false; }
virtual handler* part_handler(uint32 part_id) virtual handler* part_handler(uint32 part_id)
{ DBUG_ASSERT(0); return NULL; } { DBUG_ASSERT(0); return NULL; }

2
sql/item_vers.cc
View File

@ -71,7 +71,7 @@ VTQ_common<Item_func_X>::init_hton()
hton= plugin_hton(plugin_int_to_ref(innodb_plugin)); hton= plugin_hton(plugin_int_to_ref(innodb_plugin));
DBUG_ASSERT(hton); 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()); my_error(ER_VERS_ENGINE_UNSUPPORTED, MYF(0), Item::name ? Item::name : this->func_name());
hton= NULL; hton= NULL;

2
sql/partition_info.h
View File

@ -476,7 +476,7 @@ public:
part= vers_hist_part(); part= vers_hist_part();
} }
// TODO: cache thread-shared part_recs and increment on INSERT // 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) Vers_field_stats& vers_stat_trx(stat_trx_field fld, uint32 part_element_id)
{ {

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

@ -3859,7 +3859,7 @@ innobase_init(
innobase_hton->flush_logs = innobase_flush_logs; innobase_hton->flush_logs = innobase_flush_logs;
innobase_hton->show_status = innobase_show_status; innobase_hton->show_status = innobase_show_status;
innobase_hton->flags = 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_hton->release_temporary_latches =
innobase_release_temporary_latches; innobase_release_temporary_latches;

2
storage/innobase/handler/ha_innopart.cc
View File

@ -3045,7 +3045,7 @@ ha_innopart::records()
} }
ha_rows 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); partition_element *part_elem= reinterpret_cast<partition_element *>(_part_elem);
DBUG_ASSERT(m_part_info); DBUG_ASSERT(m_part_info);

2
storage/innobase/handler/ha_innopart.h
View File

@ -1356,7 +1356,7 @@ public:
} }
virtual ha_rows virtual ha_rows
part_recs_slow(void *_part_elem); part_records(void *_part_elem);
private: private: