database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-26801: Valgrind/MSAN errors in Column_statistics_collected::finish ...

Browse Source 
The problem was introduced in fix for MDEV-26724. That patch has made it
possible for histogram collection to fail. In particular, it fails for
non-assigned characters.

When histogram construction fails, we also abort the computation of
COUNT(DISTINCT). When we try to use the value, we get valgrind failures.

Switched the code to abort the statistics collection in this case.
This commit is contained in:
Sergei Petrunia
2021-10-11 22:47:26 +03:00
parent 93d5980435
commit 27539cd2c8
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/main/statistics_json.result
View File

@ -7443,14 +7443,11 @@ create table t1 ( a varchar(100) character set cp1251);
insert into t1 values ( _cp1251 x'88'),( _cp1251 x'98'); insert into t1 values ( _cp1251 x'88'),( _cp1251 x'98');
analyze table t1 persistent for all; analyze table t1 persistent for all;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze status Engine-independent statistics collected test.t1 analyze status Operation failed
test.t1 analyze status OK
# Command succeeded but no histogram was collected:
select hist_type, histogram select hist_type, histogram
from mysql.column_stats from mysql.column_stats
where db_name=database() and table_name='t1'; where db_name=database() and table_name='t1';
hist_type histogram hist_type histogram
NULL NULL
drop table t1; drop table t1;
# #
# ASAN use-after-poison my_strnxfrm_simple_internal / Histogram_json_hb::range_selectivity ... # ASAN use-after-poison my_strnxfrm_simple_internal / Histogram_json_hb::range_selectivity ...

1
mysql-test/main/statistics_json.test
View File

@ -235,7 +235,6 @@ create table t1 ( a varchar(100) character set cp1251);
insert into t1 values ( _cp1251 x'88'),( _cp1251 x'98'); insert into t1 values ( _cp1251 x'88'),( _cp1251 x'98');
analyze table t1 persistent for all; analyze table t1 persistent for all;
--echo # Command succeeded but no histogram was collected:
select hist_type, histogram select hist_type, histogram
from mysql.column_stats from mysql.column_stats
where db_name=database() and table_name='t1'; where db_name=database() and table_name='t1';

14
sql/sql_statistics.cc
View File

@ -314,7 +314,7 @@ public:
inline void init(THD *thd, Field * table_field); inline void init(THD *thd, Field * table_field);
inline bool add(); inline bool add();
inline void finish(MEM_ROOT *mem_root, ha_rows rows, double sample_fraction); inline bool finish(MEM_ROOT *mem_root, ha_rows rows, double sample_fraction);
inline void cleanup(); inline void cleanup();
}; };
@ -2468,7 +2468,7 @@ bool Column_statistics_collected::add()
*/ */
inline inline
void Column_statistics_collected::finish(MEM_ROOT *mem_root, ha_rows rows, bool Column_statistics_collected::finish(MEM_ROOT *mem_root, ha_rows rows,
double sample_fraction) double sample_fraction)
{ {
double val; double val;
@ -2507,6 +2507,10 @@ void Column_statistics_collected::finish(MEM_ROOT *mem_root, ha_rows rows,
{ {
delete histogram; delete histogram;
histogram= NULL; histogram= NULL;
delete count_distinct;
count_distinct= NULL;
return true; // Error
} }
} }
@ -2560,6 +2564,7 @@ void Column_statistics_collected::finish(MEM_ROOT *mem_root, ha_rows rows,
set_avg_frequency(val); set_avg_frequency(val);
set_not_null(COLUMN_STAT_AVG_FREQUENCY); set_not_null(COLUMN_STAT_AVG_FREQUENCY);
} }
return false;
} }
@ -2810,7 +2815,10 @@ int collect_statistics_for_table(THD *thd, TABLE *table)
continue; continue;
bitmap_set_bit(table->write_set, table_field->field_index); bitmap_set_bit(table->write_set, table_field->field_index);
if (!rc) if (!rc)
table_field->collected_stats->finish(&table->mem_root, rows, sample_fraction); {
rc= table_field->collected_stats->finish(&table->mem_root, rows,
sample_fraction);
}
else else
table_field->collected_stats->cleanup(); table_field->collected_stats->cleanup();
} }