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

More "straightforward" memory management

Browse Source 
Do not put Histogram objects on MEM_ROOT at all
This commit is contained in:
Sergei Petrunia
2021-09-14 17:36:10 +03:00
parent 28ad128585
commit 702f4efcd9
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_statistics.cc
View File

@@ -1238,6 +1238,8 @@ public:
table_field->read_stats->histogram= hist; table_field->read_stats->histogram= hist;
return hist; return hist;
} }
else
delete hist;
} }
return NULL; return NULL;
} }
@@ -1647,10 +1649,10 @@ Histogram_base *create_histogram(MEM_ROOT *mem_root, Histogram_type hist_type,
switch (hist_type) { switch (hist_type) {
case SINGLE_PREC_HB: case SINGLE_PREC_HB:
case DOUBLE_PREC_HB: case DOUBLE_PREC_HB:
res= new (mem_root) Histogram_binary(); res= new Histogram_binary();
break; break;
case JSON_HB: case JSON_HB:
res= new (mem_root) Histogram_json_hb(); res= new Histogram_json_hb();
break; break;
default: default:
DBUG_ASSERT(0); DBUG_ASSERT(0);

2
sql/sql_statistics.h
View File

@@ -151,7 +151,7 @@ class Histogram_builder;
/* /*
Common base for all histograms Common base for all histograms
*/ */
class Histogram_base : public Sql_alloc class Histogram_base
{ {
public: public:
virtual bool parse(MEM_ROOT *mem_root, Field *field, Histogram_type type_arg, virtual bool parse(MEM_ROOT *mem_root, Field *field, Histogram_type type_arg,