From 07c2f4e1eb76ace9f298fb097da3a766faaec908 Mon Sep 17 00:00:00 2001 From: Erik Froseth Date: Thu, 21 Oct 2021 10:28:32 +0200 Subject: [PATCH] Remove unused variables Remove multiple unused variables as reported by Clang 13 --- .../src/bindings/xcom/gcs_xcom_state_exchange.cc | 2 -- plugin/x/tests/driver/processor/commands/command.cc | 2 -- sql/join_optimizer/build_interesting_orders.cc | 2 -- sql/partition_info.cc | 3 --- sql/partitioning/partition_handler.cc | 5 ----- sql/spatial.cc | 2 ++ storage/innobase/ddl/ddl0builder.cc | 3 --- storage/innobase/row/row0upd.cc | 4 +--- storage/myisam/mi_check.cc | 4 +--- unittest/gunit/innodb/lob/lot0lob.cc | 3 --- utilities/ibd2sdi.cc | 6 ------ 11 files changed, 4 insertions(+), 32 deletions(-) diff --git a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc index a68392dcac67..0b9d1ea4b32f 100644 --- a/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc +++ b/plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_state_exchange.cc @@ -595,7 +595,6 @@ enum_gcs_error Gcs_xcom_state_exchange::broadcast_state( However, it will send an empty message anyway. */ if (exchangeable_data_len > 0) { - uint64_t slider_total_len = 0; uint64_t slider_len = 0; for (auto it = exchangeable_data.begin(); it != it_ends; ++it) { auto &msg_data = (*it); @@ -607,7 +606,6 @@ enum_gcs_error Gcs_xcom_state_exchange::broadcast_state( static_cast(slider_len)); msg_data->encode(slider, &slider_len); slider += slider_len; - slider_total_len += slider_len; } } } diff --git a/plugin/x/tests/driver/processor/commands/command.cc b/plugin/x/tests/driver/processor/commands/command.cc index afbdc5421f8e..da3a408d626d 100644 --- a/plugin/x/tests/driver/processor/commands/command.cc +++ b/plugin/x/tests/driver/processor/commands/command.cc @@ -2355,7 +2355,6 @@ Command::Result Command::cmd_compress(std::istream &input, uint8_t *dst; int dst_size; int raw_offset = 0; - uint8_t *source = reinterpret_cast(&raw[0]); int source_size = raw.length(); algorithm->set_pledged_source_size(source_size); @@ -2365,7 +2364,6 @@ Command::Result Command::cmd_compress(std::istream &input, int left_in_next = dst_size - to_copy; memcpy(dst, &raw[raw_offset], to_copy); source_size -= to_copy; - source += to_copy; if (left_in_next > 0) pos.BackUp(left_in_next); } diff --git a/sql/join_optimizer/build_interesting_orders.cc b/sql/join_optimizer/build_interesting_orders.cc index e09bccf0f832..2a9cd337ac95 100644 --- a/sql/join_optimizer/build_interesting_orders.cc +++ b/sql/join_optimizer/build_interesting_orders.cc @@ -444,7 +444,6 @@ void BuildInterestingOrders( const table_map inner_tables = pred.expr->right->tables_in_subtree; Ordering ordering = Ordering::Alloc(thd->mem_root, pred.expr->equijoin_conditions.size()); - table_map used_tables = 0; bool contains_row_item = false; for (size_t i = 0; i < pred.expr->equijoin_conditions.size(); ++i) { Item *item = pred.expr->equijoin_conditions[i]->get_arg(1); @@ -466,7 +465,6 @@ void BuildInterestingOrders( } } ordering[i].item = orderings->GetHandle(item); - used_tables |= item->used_tables(); } if (contains_row_item) { continue; diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 633e7c3db640..f7e4fc4d47df 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -896,7 +896,6 @@ partition_element *partition_info::get_part_elem(const char *partition_name, const char *partition_info::find_duplicate_name() { collation_unordered_set partition_names{system_charset_info, PSI_INSTRUMENT_ME}; - uint max_names; List_iterator parts_it(partitions); partition_element *p_elem; @@ -908,8 +907,6 @@ const char *partition_info::find_duplicate_name() { And this only happens when in ALTER TABLE with full table copy. */ - max_names = num_parts; - if (is_sub_partitioned()) max_names += num_parts * num_subparts; while ((p_elem = (parts_it++))) { const char *partition_name = p_elem->partition_name; if (!partition_names.insert(partition_name).second) return partition_name; diff --git a/sql/partitioning/partition_handler.cc b/sql/partitioning/partition_handler.cc index 041a94cf2413..e2f00ed49d11 100644 --- a/sql/partitioning/partition_handler.cc +++ b/sql/partitioning/partition_handler.cc @@ -200,7 +200,6 @@ void Partition_share::release_auto_inc_if_possible( */ bool Partition_share::populate_partition_name_hash(partition_info *part_info) { - uint tot_names; uint num_subparts = part_info->num_subparts; DBUG_TRACE; assert(!part_info->is_sub_partitioned() || num_subparts); @@ -222,10 +221,6 @@ bool Partition_share::populate_partition_name_hash(partition_info *part_info) { if (partition_name_hash != nullptr) { return false; } - tot_names = part_info->num_parts; - if (part_info->is_sub_partitioned()) { - tot_names += part_info->num_parts * num_subparts; - } partition_names = static_cast(my_malloc( key_memory_Partition_share, part_info->get_tot_partitions() * sizeof(*partition_names), MYF(MY_WME))); diff --git a/sql/spatial.cc b/sql/spatial.cc index 534bea423d84..77e04c9beb2c 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -4387,6 +4387,8 @@ void Gis_wkb_vector::reassemble() { memcpy(q, prev_start, len); total_len += len; } + + (void)total_len; assert(total_len == totlen); // Inner rings doesn't have ring count. diff --git a/storage/innobase/ddl/ddl0builder.cc b/storage/innobase/ddl/ddl0builder.cc index 5e61568d89f2..d5505b8bb219 100644 --- a/storage/innobase/ddl/ddl0builder.cc +++ b/storage/innobase/ddl/ddl0builder.cc @@ -1792,7 +1792,6 @@ dberr_t Builder::create_merge_sort_tasks() noexcept { ut_a(!m_thread_ctxs.empty()); - os_offset_t size{}; Thread_ctxs dupcheck{}; size_t n_runs_to_merge{}; Dup dup = {m_index, m_ctx.m_table, m_ctx.m_col_map, 0}; @@ -1809,8 +1808,6 @@ dberr_t Builder::create_merge_sort_tasks() noexcept { /* We have to check these files using a merge cursor. */ dupcheck.push_back(thread_ctx); } - - size += thread_ctx->m_file.m_size; } if (!dupcheck.empty()) { diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc index 315c9fc7e442..e0abf1bcec23 100644 --- a/storage/innobase/row/row0upd.cc +++ b/storage/innobase/row/row0upd.cc @@ -2535,13 +2535,11 @@ static bool row_upd_clust_rec_by_insert_inherit_func( #ifdef UNIV_DEBUG if (UNIV_LIKELY(rec != nullptr)) { - const byte *rec_data = rec_get_nth_field(rec, offsets, i, &len); + rec_get_nth_field(rec, offsets, i, &len); ut_ad(len == dfield_get_len(dfield)); ut_ad(len != UNIV_SQL_NULL); ut_ad(len >= BTR_EXTERN_FIELD_REF_SIZE); - rec_data += len - BTR_EXTERN_FIELD_REF_SIZE; - /* The pointer must not be zero. */ ut_ad(!ref.is_null()); diff --git a/storage/myisam/mi_check.cc b/storage/myisam/mi_check.cc index f5e9d4e217e0..4fc21bbe2f3f 100644 --- a/storage/myisam/mi_check.cc +++ b/storage/myisam/mi_check.cc @@ -2393,7 +2393,7 @@ int mi_repair_by_sort(MI_CHECK *param, MI_INFO *info, const char *name, int mi_repair_parallel(MI_CHECK *param, MI_INFO *info, const char *name, int rep_quick, bool no_copy_stat) { int got_error; - uint i, key, total_key_length, istep; + uint i, key, istep; ulong rec_length; ha_rows start_records; my_off_t new_header_length, del; @@ -2563,7 +2563,6 @@ int mi_repair_parallel(MI_CHECK *param, MI_INFO *info, const char *name, mi_check_print_error(param, "Not enough memory for key!"); goto err; } - total_key_length = 0; rec_per_key_part = param->rec_per_key_part; info->state->records = info->state->del = share->state.split = 0; info->state->empty = 0; @@ -2621,7 +2620,6 @@ int mi_repair_parallel(MI_CHECK *param, MI_INFO *info, const char *name, sort_param[i].key_length += 2 + (keyseg->length >= 127); if (keyseg->flag & HA_NULL_PART) sort_param[i].key_length++; } - total_key_length += sort_param[i].key_length; if (sort_param[i].keyinfo->flag & HA_FULLTEXT) { uint ft_max_word_len_for_sort = diff --git a/unittest/gunit/innodb/lob/lot0lob.cc b/unittest/gunit/innodb/lob/lot0lob.cc index 6a8cd0a00313..e4b2cc5baccf 100644 --- a/unittest/gunit/innodb/lob/lot0lob.cc +++ b/unittest/gunit/innodb/lob/lot0lob.cc @@ -64,7 +64,6 @@ dberr_t insert(trx_id_t trxid, ref_t ref, byte *blob, ulint len) { Fname("lob::insert"); dberr_t ret = DB_SUCCESS; - ulint total_written = 0; byte *ptr = blob; LOG("LOB length = " << len); @@ -74,7 +73,6 @@ dberr_t insert(trx_id_t trxid, ref_t ref, byte *blob, ulint len) { flst_base_node_t *index_list = page.index_list(); ulint to_write = page.write(trxid, ptr, len); - total_written += to_write; ulint remaining = len; LOG("Remaining = " << remaining); @@ -98,7 +96,6 @@ dberr_t insert(trx_id_t trxid, ref_t ref, byte *blob, ulint len) { LOG("Copy data into the new LOB page"); to_write = data_page.write(trxid, ptr, remaining); - total_written += to_write; data_page.set_trx_id(trxid); /* Allocate a new index entry */ diff --git a/utilities/ibd2sdi.cc b/utilities/ibd2sdi.cc index 93a176ff509a..83a056748f94 100644 --- a/utilities/ibd2sdi.cc +++ b/utilities/ibd2sdi.cc @@ -1629,8 +1629,6 @@ uint64_t ibd2sdi::copy_compressed_blob(ib_tablespace *ts, DBUG_TRACE; byte page_buf[UNIV_PAGE_SIZE_MAX]; - uint64_t calc_length = 0; - uint64_t part_len; page_no_t page_num = first_blob_page_num; z_stream d_stream; int err; @@ -1667,16 +1665,12 @@ uint64_t ibd2sdi::copy_compressed_blob(ib_tablespace *ts, break; } - part_len = - mach_read_from_4(page_buf + FIL_PAGE_DATA + lob::LOB_HDR_PART_LEN); - page_no_t next_page_num = mach_read_from_4(page_buf + FIL_PAGE_NEXT); space_id_t space_id = mach_read_from_4(page_buf + FIL_PAGE_ARCH_LOG_NO_OR_SPACE_ID); d_stream.next_in = page_buf + FIL_PAGE_DATA; d_stream.avail_in = static_cast(page_size.physical() - FIL_PAGE_DATA); - calc_length += part_len; err = inflate(&d_stream, Z_NO_FLUSH); switch (err) { case Z_OK: