mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-18478 ANALYZE for statement should show selectivity of ICP, part#3

Browse source 
Fix the previous patch:
- Only enable handler_stats if thd->should_collect_handler_stats()==true.
- Make handler_index_cond_check() work when handler_stats are not enabled.
This commit is contained in:
Sergei Petrunia 2024-04-22 20:39:31 +03:00
parent 86e727b1ee
commit 486d42d812
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sql/handler.cc
View file

@ -6995,7 +6995,6 @@ extern "C" check_result_t handler_index_cond_check(void* h_arg)
check_result_t res; check_result_t res;
DEBUG_SYNC(thd, "handler_index_cond_check"); DEBUG_SYNC(thd, "handler_index_cond_check");
DBUG_ASSERT(h->handler_stats);
enum thd_kill_levels killed= thd_kill_level(thd); enum thd_kill_levels killed= thd_kill_level(thd);
if (unlikely(killed != THD_IS_NOT_KILLED)) if (unlikely(killed != THD_IS_NOT_KILLED))
@ -7009,13 +7008,15 @@ extern "C" check_result_t handler_index_cond_check(void* h_arg)
if (unlikely(h->end_range) && h->compare_key2(h->end_range) > 0) if (unlikely(h->end_range) && h->compare_key2(h->end_range) > 0)
return CHECK_OUT_OF_RANGE; return CHECK_OUT_OF_RANGE;
h->increment_statistics(&SSV::ha_icp_attempts); h->increment_statistics(&SSV::ha_icp_attempts);
h->handler_stats->icp_attempts++; if (unlikely(h->handler_stats))
h->handler_stats->icp_attempts++;
res= CHECK_NEG; res= CHECK_NEG;
if (h->pushed_idx_cond->val_int()) if (h->pushed_idx_cond->val_int())
{ {
res= CHECK_POS; res= CHECK_POS;
h->fast_increment_statistics(&SSV::ha_icp_match); h->fast_increment_statistics(&SSV::ha_icp_match);
h->handler_stats->icp_match++; if (unlikely(h->handler_stats))
h->handler_stats->icp_match++;
} }
return res; return res;
} }

6
sql/table.cc
View file

@ -5871,7 +5871,11 @@ void TABLE::init(THD *thd, TABLE_LIST *tl)
(*f_ptr)->cond_selectivity= 1.0; (*f_ptr)->cond_selectivity= 1.0;
} }
file->ha_handler_stats_reset(); /* enable and clear or disable engine query statistics */
if (thd->should_collect_handler_stats())
file->ha_handler_stats_reset();
else
file->ha_handler_stats_disable();
notnull_cond= 0; notnull_cond= 0;
DBUG_ASSERT(!file->keyread_enabled()); DBUG_ASSERT(!file->keyread_enabled());