diff options
author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-06-28 21:31:14 +0300 |
---|---|---|
committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-07-12 22:00:40 +0300 |
commit | f64a4f672ab9c5338a700a05650df394a732aac9 (patch) | |
tree | 80ef166d913eae50e3ffa13de9204e1a4c741b37 /sql/table.cc | |
parent | 0f6a5b4390efeac19ff3ad6fd3a8dd32241b343c (diff) | |
download | mariadb-git-f64a4f672ab9c5338a700a05650df394a732aac9.tar.gz |
follow-up MDEV-18166: rename marking functions
Reformulate mark_columns_used_by_index* function family in a more laconic
way:
mark_columns_used_by_index -> mark_index_columns
mark_columns_used_by_index_for_read_no_reset -> mark_index_columns_for_read
mark_columns_used_by_index_no_reset -> mark_index_columns_no_reset
static mark_index_columns -> do_mark_index_columns
Diffstat (limited to 'sql/table.cc')
-rw-r--r-- | sql/table.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sql/table.cc b/sql/table.cc index 4afd2488ea1..b7cf1274400 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -6329,7 +6329,7 @@ void TABLE::prepare_for_position() if ((file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX) && s->primary_key < MAX_KEY) { - mark_columns_used_by_index_for_read_no_reset(s->primary_key); + mark_index_columns_for_read(s->primary_key); /* signal change */ file->column_bitmaps_signal(); } @@ -6345,7 +6345,7 @@ MY_BITMAP *TABLE::prepare_for_keyread(uint index, MY_BITMAP *map) file->ha_start_keyread(index); if (map != read_set || !(file->index_flags(index, 0, 1) & HA_CLUSTERED_INDEX)) { - mark_columns_used_by_index(index, map); + mark_index_columns(index, map); column_bitmaps_set(map); } DBUG_RETURN(backup); @@ -6356,12 +6356,12 @@ MY_BITMAP *TABLE::prepare_for_keyread(uint index, MY_BITMAP *map) Mark that only fields from one key is used. Useful before keyread. */ -void TABLE::mark_columns_used_by_index(uint index, MY_BITMAP *bitmap) +void TABLE::mark_index_columns(uint index, MY_BITMAP *bitmap) { - DBUG_ENTER("TABLE::mark_columns_used_by_index"); + DBUG_ENTER("TABLE::mark_index_columns"); bitmap_clear_all(bitmap); - mark_columns_used_by_index_no_reset(index, bitmap); + mark_index_columns_no_reset(index, bitmap); DBUG_VOID_RETURN; } @@ -6385,8 +6385,8 @@ void TABLE::restore_column_maps_after_keyread(MY_BITMAP *backup) DBUG_VOID_RETURN; } -static void mark_index_columns(TABLE *table, uint index, - MY_BITMAP *bitmap, bool read) +static void do_mark_index_columns(TABLE *table, uint index, + MY_BITMAP *bitmap, bool read) { KEY_PART_INFO *key_part= table->key_info[index].key_part; uint key_parts= table->key_info[index].user_defined_key_parts; @@ -6397,22 +6397,22 @@ static void mark_index_columns(TABLE *table, uint index, bitmap_set_bit(bitmap, key_part[k].fieldnr-1); if (table->file->ha_table_flags() & HA_PRIMARY_KEY_IN_READ_INDEX && table->s->primary_key != MAX_KEY && table->s->primary_key != index) - mark_index_columns(table, table->s->primary_key, bitmap, read); + do_mark_index_columns(table, table->s->primary_key, bitmap, read); } /* mark columns used by key, but don't reset other fields */ -inline void TABLE::mark_columns_used_by_index_no_reset(uint index, MY_BITMAP *bitmap) +inline void TABLE::mark_index_columns_no_reset(uint index, MY_BITMAP *bitmap) { - mark_index_columns(this, index, bitmap, false); + do_mark_index_columns(this, index, bitmap, false); } -inline void TABLE::mark_columns_used_by_index_for_read_no_reset(uint index) +inline void TABLE::mark_index_columns_for_read(uint index) { - mark_index_columns(this, index, read_set, true); + do_mark_index_columns(this, index, read_set, true); } /* @@ -6433,7 +6433,7 @@ void TABLE::mark_auto_increment_column() bitmap_set_bit(read_set, found_next_number_field->field_index); bitmap_set_bit(write_set, found_next_number_field->field_index); if (s->next_number_keypart) - mark_columns_used_by_index_for_read_no_reset(s->next_number_index); + mark_index_columns_for_read(s->next_number_index); file->column_bitmaps_signal(); } @@ -6489,7 +6489,7 @@ void TABLE::mark_columns_needed_for_delete() file->use_hidden_primary_key(); else { - mark_columns_used_by_index_for_read_no_reset(s->primary_key); + mark_index_columns_for_read(s->primary_key); need_signal= true; } } @@ -6579,7 +6579,7 @@ void TABLE::mark_columns_needed_for_update() file->use_hidden_primary_key(); else { - mark_columns_used_by_index_for_read_no_reset(s->primary_key); + mark_index_columns_for_read(s->primary_key); need_signal= true; } } @@ -6742,7 +6742,7 @@ void TABLE::mark_columns_per_binlog_row_image() We don't need to mark the primary key in the rpl_write_set as the binary log will include all columns read anyway. */ - mark_columns_used_by_index_for_read_no_reset(s->primary_key); + mark_index_columns_for_read(s->primary_key); /* Only write columns that have changed */ rpl_write_set= write_set; break; |