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

remove unneeded shared methods

Browse Source 
Signed-off-by: Michael Okoko <okokomichaels@outlook.com>
This commit is contained in:
Michael Okoko
2021-07-29 23:21:43 +01:00
committed by Sergei Petrunia
parent 1fa7af749e
commit 9bba595528
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_statistics.cc
View File

@ -1086,7 +1086,7 @@ public:
// Note: this is dumb. the histogram size is stored with the // Note: this is dumb. the histogram size is stored with the
// histogram! // histogram!
stat_field->store(stats->histogram_? stat_field->store(stats->histogram_?
stats->histogram_->get_size() : 0); stats->histogram_->get_width() : 0);
break; break;
case COLUMN_STAT_HIST_TYPE: case COLUMN_STAT_HIST_TYPE:
if (stats->histogram_) if (stats->histogram_)
@ -1256,7 +1256,6 @@ bool Histogram_binary::parse(MEM_ROOT *mem_root, Histogram_type type_arg, const
return false; return false;
} }
/* /*
Save the histogram data info a table field. Save the histogram data info a table field.
*/ */
@ -1268,7 +1267,7 @@ void Histogram_binary::serialize(Field *field)
&my_charset_bin); &my_charset_bin);
} }
else else
field->store((char*)get_values(), get_size(), &my_charset_bin); field->store((char*)get_values(), get_width(), &my_charset_bin);
} }
void Histogram_binary::init_for_collection(MEM_ROOT *mem_root, void Histogram_binary::init_for_collection(MEM_ROOT *mem_root,
@ -1287,6 +1286,7 @@ void Histogram_json::init_for_collection(MEM_ROOT *mem_root, Histogram_type htyp
values = (uchar*)alloc_root(mem_root, size_arg); values = (uchar*)alloc_root(mem_root, size_arg);
size = (uint8) size_arg; size = (uint8) size_arg;
} }
/* /*
An object of the class Index_stat is created to read statistical An object of the class Index_stat is created to read statistical
data on tables from the statistical table table_stat, to update data on tables from the statistical table table_stat, to update
@ -2641,18 +2641,19 @@ bool Column_statistics_collected::add()
/* /*
Create an empty Histogram_binary object from histogram_type. Create an empty Histogram object from histogram_type.
Note: it is not yet clear whether collection-time histogram should be the same Note: it is not yet clear whether collection-time histogram should be the same
as lookup-time histogram. At the moment, they are. as lookup-time histogram. At the moment, they are.
*/ */
Histogram_binary * get_histogram_by_type(MEM_ROOT *mem_root, Histogram_type hist_type) { Histogram_base * get_histogram_by_type(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:
case JSON:
return new Histogram_binary(); return new Histogram_binary();
case JSON:
return new Histogram_json();
default: default:
DBUG_ASSERT(0); DBUG_ASSERT(0);
} }

13
sql/sql_statistics.h
View File

@ -172,11 +172,6 @@ public:
virtual double point_selectivity(double pos, double avg_selection)=0; virtual double point_selectivity(double pos, double avg_selection)=0;
// Legacy: return the size of the histogram on disk.
// This will be stored in mysql.column_stats.hist_size column.
// Newer, JSON-based histograms may return 0.
virtual uint get_size()=0;
virtual ~Histogram_base(){} virtual ~Histogram_base(){}
}; };
@ -189,8 +184,6 @@ public:
Histogram_type get_type() override { return type; } Histogram_type get_type() override { return type; }
uint get_size() override { return (uint) size; }
uint get_width() override uint get_width() override
{ {
switch (type) { switch (type) {
@ -283,7 +276,7 @@ public:
void set_values (uchar *vals) override { values= (uchar *) vals; } void set_values (uchar *vals) override { values= (uchar *) vals; }
void set_size (ulonglong sz) override { size= (uint8) sz; } void set_size (ulonglong sz) override { size= (uint8) sz; }
bool is_available() override { return get_size() > 0 && get_values(); } bool is_available() override { return get_width() > 0 && get_values(); }
/* /*
This function checks that histograms should be usable only when This function checks that histograms should be usable only when
@ -354,8 +347,6 @@ public:
void serialize(Field *to_field) override{} void serialize(Field *to_field) override{}
uint get_size() override {return (uint) size;}
// returns number of buckets in the histogram // returns number of buckets in the histogram
uint get_width() override uint get_width() override
{ {
@ -371,7 +362,7 @@ public:
void init_for_collection(MEM_ROOT *mem_root, Histogram_type htype_arg, ulonglong size) override; void init_for_collection(MEM_ROOT *mem_root, Histogram_type htype_arg, ulonglong size) override;
bool is_available() override {return get_size() > 0 && get_values(); } bool is_available() override {return get_width() > 0 && get_values(); }
bool is_usable(THD *thd) override bool is_usable(THD *thd) override
{ {