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

Code cleanup + reduce the diff size

This commit is contained in:
Sergei Petrunia
2021-08-31 00:53:09 +03:00
parent 229c836d6a
commit 3486bf4110
2 changed files with 27 additions and 37 deletions

View File

@ -195,26 +195,6 @@ private:
class Histogram_binary : public Histogram_base
{
public:
bool parse(MEM_ROOT *mem_root, Field *, Histogram_type type_arg,
const char *hist_data, size_t hist_data_len) override;
void serialize(Field *to_field) override;
Histogram_type get_type() override { return type; }
uint get_width() override
{
switch (type) {
case SINGLE_PREC_HB:
return size;
case DOUBLE_PREC_HB:
return size / 2;
default:
DBUG_ASSERT(0);
}
return 0;
}
private:
Histogram_type type;
uint8 size; /* Size of values array, in bytes */
@ -233,6 +213,20 @@ private:
return 1;
}
public:
uint get_width() override
{
switch (type) {
case SINGLE_PREC_HB:
return size;
case DOUBLE_PREC_HB:
return size / 2;
default:
DBUG_ASSERT(0);
}
return 0;
}
private:
uint get_value(uint i)
{
DBUG_ASSERT(i < get_width());
@ -287,10 +281,16 @@ private:
}
public:
void init_for_collection(MEM_ROOT *mem_root, Histogram_type htype_arg, ulonglong size) override;
uint get_size() override {return (uint)size;}
Histogram_type get_type() override { return type; }
bool parse(MEM_ROOT *mem_root, Field *, Histogram_type type_arg,
const char *hist_data, size_t hist_data_len) override;
void serialize(Field *to_field) override;
void init_for_collection(MEM_ROOT *mem_root, Histogram_type htype_arg,
ulonglong size) override;
bool is_available() override { return (values!=NULL); }
/*