revision-id: 1b9072b140f73815367d01d0efcd144b0ffbb49c (mariadb-10.6.1-321-g1b9072b140f) parent(s): 0492890653685ea8e405467033cfe92f16a7cc18 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-12-02 12:30:40 +0300 message: MDEV-26519: Improved histograms: Make JSON parser efficient Previous JSON parser was using an API which made the parsing inefficient: the same JSON contents was parsed again and again. Switch to using a lower-level parsing API which allows to do parsing in an efficient way. --- mysql-test/main/statistics_json.result | 43 +++- mysql-test/main/statistics_json.test | 9 - sql/opt_histogram_json.cc | 454 ++++++++++++++++++++++----------- sql/opt_histogram_json.h | 6 +- sql/share/errmsg-utf8.txt | 2 +- sql/sql_statistics.cc | 9 +- sql/sql_statistics.h | 9 +- 7 files changed, 351 insertions(+), 181 deletions(-) diff --git a/mysql-test/main/statistics_json.result b/mysql-test/main/statistics_json.result index 762f869fae5..13239c7e513 100644 --- a/mysql-test/main/statistics_json.result +++ b/mysql-test/main/statistics_json.result @@ -4263,54 +4263,79 @@ UPDATE mysql.column_stats SET histogram='["not-what-you-expect"]' WHERE table_name='t1_json'; FLUSH TABLES; explain select * from t1_json limit 1; -ERROR HY000: Failed to parse histogram: Root JSON element must be a JSON object at offset 0. +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1_json ALL NULL NULL NULL NULL 10 +Warnings: +Warning 4186 Failed to parse histogram for table test.t1_json: Root JSON element must be a JSON object at offset 1. UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":"not-histogram"}' WHERE table_name='t1_json'; FLUSH TABLES; explain select * from t1_json limit 1; -ERROR HY000: Failed to parse histogram: A JSON array expected at offset 0. +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1_json ALL NULL NULL NULL NULL 10 +Warnings: +Warning 4186 Failed to parse histogram for table test.t1_json: histogram_hb_v2 must contain an array at offset 35. UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":["not-a-bucket"]}' WHERE table_name='t1_json'; FLUSH TABLES; explain select * from t1_json limit 1; -ERROR HY000: Failed to parse histogram: Object expected at offset 19. +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1_json ALL NULL NULL NULL NULL 10 +Warnings: +Warning 4186 Failed to parse histogram for table test.t1_json: Expected an object in the buckets array at offset 35. UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[{"no-expected-members":1}]}' WHERE table_name='t1_json'; FLUSH TABLES; explain select * from t1_json limit 1; -ERROR HY000: Failed to parse histogram: .start member must be present and be a scalar at offset 20. +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1_json ALL NULL NULL NULL NULL 10 +Warnings: +Warning 4186 Failed to parse histogram for table test.t1_json: "start" element not present at offset 45. UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[{"start":{}}]}' WHERE table_name='t1_json'; FLUSH TABLES; explain select * from t1_json limit 1; -ERROR HY000: Failed to parse histogram: .start member must be present and be a scalar at offset 20. +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1_json ALL NULL NULL NULL NULL 10 +Warnings: +Warning 4186 Failed to parse histogram for table test.t1_json: "size" element not present at offset 31. UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[{"start":"aaa", "size":"not-an-integer"}]}' WHERE table_name='t1_json'; FLUSH TABLES; explain select * from t1_json limit 1; -ERROR HY000: Failed to parse histogram: .size member must be present and be a scalar at offset 20. +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1_json ALL NULL NULL NULL NULL 10 +Warnings: +Warning 4186 Failed to parse histogram for table test.t1_json: "ndv" element not present at offset 60. UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[{"start":"aaa", "size":0.25}]}' WHERE table_name='t1_json'; FLUSH TABLES; explain select * from t1_json limit 1; -ERROR HY000: Failed to parse histogram: .ndv member must be present and be a scalar at offset 20. +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1_json ALL NULL NULL NULL NULL 10 +Warnings: +Warning 4186 Failed to parse histogram for table test.t1_json: "ndv" element not present at offset 48. UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[{"start":"aaa", "size":0.25, "ndv":1}]}' WHERE table_name='t1_json'; FLUSH TABLES; explain select * from t1_json limit 1; -ERROR HY000: Failed to parse histogram: .end must be present in the last bucket and only there at offset 0. +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1_json ALL NULL NULL NULL NULL 10 UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[]}' WHERE table_name='t1_json'; FLUSH TABLES; explain select * from t1_json limit 1; -ERROR HY000: Failed to parse histogram: .end must be present in the last bucket and only there at offset 0. +id select_type table type possible_keys key key_len ref rows Extra +1 SIMPLE t1_json ALL NULL NULL NULL NULL 10 +Warnings: +Warning 4186 Failed to parse histogram for table test.t1_json: Histogram must have at least one bucket at offset 21. create table t2 ( city varchar(100) ); diff --git a/mysql-test/main/statistics_json.test b/mysql-test/main/statistics_json.test index 23e5e7395a7..b0a1795c235 100644 --- a/mysql-test/main/statistics_json.test +++ b/mysql-test/main/statistics_json.test @@ -46,62 +46,53 @@ drop table ten; UPDATE mysql.column_stats SET histogram='["not-what-you-expect"]' WHERE table_name='t1_json'; FLUSH TABLES; ---error ER_JSON_HISTOGRAM_PARSE_FAILED explain select * from t1_json limit 1; UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":"not-histogram"}' WHERE table_name='t1_json'; FLUSH TABLES; ---error ER_JSON_HISTOGRAM_PARSE_FAILED explain select * from t1_json limit 1; UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":["not-a-bucket"]}' WHERE table_name='t1_json'; FLUSH TABLES; ---error ER_JSON_HISTOGRAM_PARSE_FAILED explain select * from t1_json limit 1; UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[{"no-expected-members":1}]}' WHERE table_name='t1_json'; FLUSH TABLES; ---error ER_JSON_HISTOGRAM_PARSE_FAILED explain select * from t1_json limit 1; UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[{"start":{}}]}' WHERE table_name='t1_json'; FLUSH TABLES; ---error ER_JSON_HISTOGRAM_PARSE_FAILED explain select * from t1_json limit 1; UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[{"start":"aaa", "size":"not-an-integer"}]}' WHERE table_name='t1_json'; FLUSH TABLES; ---error ER_JSON_HISTOGRAM_PARSE_FAILED explain select * from t1_json limit 1; UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[{"start":"aaa", "size":0.25}]}' WHERE table_name='t1_json'; FLUSH TABLES; ---error ER_JSON_HISTOGRAM_PARSE_FAILED explain select * from t1_json limit 1; UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[{"start":"aaa", "size":0.25, "ndv":1}]}' WHERE table_name='t1_json'; FLUSH TABLES; ---error ER_JSON_HISTOGRAM_PARSE_FAILED explain select * from t1_json limit 1; UPDATE mysql.column_stats SET histogram='{"histogram_hb_v2":[]}' WHERE table_name='t1_json'; FLUSH TABLES; ---error ER_JSON_HISTOGRAM_PARSE_FAILED explain select * from t1_json limit 1; --source include/have_sequence.inc diff --git a/sql/opt_histogram_json.cc b/sql/opt_histogram_json.cc index 842f9a5ce67..4439b6d5075 100644 --- a/sql/opt_histogram_json.cc +++ b/sql/opt_histogram_json.cc @@ -367,189 +367,335 @@ void Histogram_json_hb::init_for_collection(MEM_ROOT *mem_root, /* - @brief - Parse the histogram from its on-disk representation + A syntax sugar interface to json_string_t +*/ +class Json_string +{ + json_string_t str; +public: + explicit Json_string(const char *name) + { + json_string_set_str(&str, (const uchar*)name, + (const uchar*)name + strlen(name)); + json_string_set_cs(&str, system_charset_info); + } + json_string_t *get() { return &str; } +}; - @return - false OK - True Error + +/* + This [partially] saves the JSON parser state and then can rollback the parser + to it. + + The goal of this is to be able to make multiple json_key_matches() calls: + + Json_saved_parser_state save(je); + if (json_key_matches(je, KEY_NAME_1)) { + ... + return; + } + save.restore_to(je); + if (json_key_matches(je, KEY_NAME_2)) { + ... + } + + This allows one to parse JSON objects where [optional] members come in any + order. */ -bool Histogram_json_hb::parse(MEM_ROOT *mem_root, Field *field, - Histogram_type type_arg, const char *hist_data, - size_t hist_data_len) +class Json_saved_parser_state { - const char *err; - DBUG_ENTER("Histogram_json_hb::parse"); - DBUG_ASSERT(type_arg == JSON_HB); - const char *err_pos= hist_data; - const char *obj1; - int obj1_len; - double cumulative_size= 0.0; - size_t end_member_index= (size_t)-1; - StringBuffer<128> value_buf; - StringBuffer<128> unescape_buf; + const uchar *c_str; + my_wc_t c_next; + int state; +public: + explicit Json_saved_parser_state(const json_engine_t *je) : + c_str(je->s.c_str), + c_next(je->s.c_next), + state(je->state) + {} + void restore_to(json_engine_t *je) + { + je->s.c_str= c_str; + je->s.c_next= c_next; + je->state= state; + } +}; - if (JSV_OBJECT != json_type(hist_data, hist_data + hist_data_len, - &obj1, &obj1_len)) + +bool read_bucket_endpoint(json_engine_t *je, Field *field, String *out, + const char **err) +{ + if (json_read_value(je)) + return true; + + const char* je_value= (const char*)je->value; + if (je->value_type == JSON_VALUE_STRING && je->value_escaped) { - err= "Root JSON element must be a JSON object"; - err_pos= hist_data; - goto error; + StringBuffer<128> unescape_buf; + if (json_unescape_to_string(je_value, je->value_len, &unescape_buf)) + { + *err= "Un-escape error"; + return true; + } + field->store_text(unescape_buf.ptr(), unescape_buf.length(), + unescape_buf.charset()); } + else + field->store_text(je_value, je->value_len, &my_charset_utf8mb4_bin); - const char *hist_array; - int hist_array_len; - if (JSV_ARRAY != json_get_object_key(obj1, obj1 + obj1_len, - JSON_NAME, &hist_array, - &hist_array_len)) + out->alloc(field->pack_length()); + uint bytes= field->get_key_image((uchar*)out->ptr(), + field->key_length(), Field::itRAW); + out->length(bytes); + return false; +} + + +/* + @brief Parse a JSON reprsentation for one histogram bucket + + @param je The JSON parser object + @param field Table field we are using histogram (used to convert + endpoints from text representation to binary) + @param total_size INOUT Fraction of the table rows in the buckets parsed so + far. + @param assigned_last_end OUT TRUE<=> The bucket had "end" members, the + function has saved it in + this->last_bucket_end_endp + @param err OUT If function returns 1, this *may* be set to point to text + describing the error. + + @detail + + Parse a JSON object in this form: + + { "start": "value", "size":nnn.nn, "ndv": nnn, "end": "value"} + + Unknown members are ignored. + + @return + 0 OK + 1 Parse Error + -1 EOF +*/ +int Histogram_json_hb::parse_bucket(json_engine_t *je, Field *field, + double *total_size, + bool *assigned_last_end, + const char **err) +{ + *assigned_last_end= false; + if (json_scan_next(je)) + return 1; + if (je->state != JST_VALUE) { - err_pos= obj1; - err= "A JSON array expected"; - goto error; + if (je->state == JST_ARRAY_END) + return -1; // EOF + else + return 1; // An error } - for (int i= 0;; i++) + if (json_scan_next(je) || je->state != JST_OBJ_START) { - const char *bucket_info; - int bucket_info_len; - enum json_types ret= json_get_array_item(hist_array, hist_array+hist_array_len, - i, &bucket_info, - &bucket_info_len); - if (ret == JSV_NOTHING) - break; - if (ret == JSV_BAD_JSON) - { - err_pos= hist_array; - err= "JSON parse error"; - goto error; - } - if (ret != JSV_OBJECT) - { - err_pos= hist_array; - err= "Object expected"; - goto error; - } + *err= "Expected an object in the buckets array"; + return 1; + } - // Ok, now we are parsing the JSON object describing the bucket - // Read the "start" field. - const char *val; - int val_len; - ret= json_get_object_key(bucket_info, bucket_info+bucket_info_len, - "start", &val, &val_len); - if (ret != JSV_STRING && ret != JSV_NUMBER) - { - err_pos= bucket_info; - err= ".start member must be present and be a scalar"; - goto error; - } + bool have_start= false; + bool have_size= false; + bool have_ndv= false; - // Read the "size" field. - const char *size; - int size_len; - ret= json_get_object_key(bucket_info, bucket_info+bucket_info_len, - "size", &size, &size_len); - if (ret != JSV_NUMBER) - { - err_pos= bucket_info; - err= ".size member must be present and be a scalar"; - goto error; - } + double size_d; + longlong ndv_ll; + StringBuffer<128> value_buf; - int conv_err; - char *size_end= (char*)size + size_len; - double size_d= my_strtod(size, &size_end, &conv_err); - if (conv_err) - { - err_pos= size; - err= ".size member must be a floating-point value"; - goto error; - } - cumulative_size += size_d; - - // Read the "ndv" field - const char *ndv; - int ndv_len; - ret= json_get_object_key(bucket_info, bucket_info+bucket_info_len, - "ndv", &ndv, &ndv_len); - if (ret != JSV_NUMBER) - { - err_pos= bucket_info; - err= ".ndv member must be present and be a scalar"; - goto error; - } - char *ndv_end= (char*)ndv + ndv_len; - longlong ndv_ll= my_strtoll10(ndv, &ndv_end, &conv_err); - if (conv_err) + while (!json_scan_next(je) && je->state != JST_OBJ_END) + { + Json_saved_parser_state save1(je); + Json_string start_str("start"); + if (json_key_matches(je, start_str.get())) { - err_pos= ndv; - err= ".ndv member must be an integer value"; - goto error; - } + if (read_bucket_endpoint(je, field, &value_buf, err)) + return 1; - unescape_buf.set_charset(field->charset()); - uint len_to_copy= field->key_length(); - if (json_unescape_to_string(val, val_len, &unescape_buf)) - { - err_pos= ndv; - err= "Out of memory"; - goto error; + have_start= true; + continue; } - field->store_text(unescape_buf.ptr(), unescape_buf.length(), - unescape_buf.charset()); - value_buf.alloc(field->pack_length()); - uint bytes= field->get_key_image((uchar*)value_buf.ptr(), len_to_copy, - Field::itRAW); - buckets.push_back({std::string(value_buf.ptr(), bytes), cumulative_size, - ndv_ll}); - - // Read the "end" field - const char *end_val; - int end_val_len; - ret= json_get_object_key(bucket_info, bucket_info+bucket_info_len, - "end", &end_val, &end_val_len); - if (ret != JSV_NOTHING && ret != JSV_STRING && ret !=JSV_NUMBER) + save1.restore_to(je); + + Json_string size_str("size"); + if (json_key_matches(je, size_str.get())) { - err_pos= bucket_info; - err= ".end member must be a scalar"; - goto error; + if (json_read_value(je)) + return 1; + + const char *size= (const char*)je->value_begin; + char *size_end= (char*)je->value_end; + int conv_err; + size_d= my_strtod(size, &size_end, &conv_err); + if (conv_err) + { + *err= ".size member must be a floating-point value"; + return 1; + } + have_size= true; + continue; } - if (ret != JSV_NOTHING) + save1.restore_to(je); + + Json_string ndv_str("ndv"); + if (json_key_matches(je, ndv_str.get())) { - if (json_unescape_to_string(end_val, end_val_len, &unescape_buf)) + if (json_read_value(je)) + return 1; + + const char *ndv= (const char*)je->value_begin; + char *ndv_end= (char*)je->value_end; + int conv_err; + ndv_ll= my_strtoll10(ndv, &ndv_end, &conv_err); + if (conv_err) { - err_pos= bucket_info; - err= "Out of memory"; - goto error; + *err= ".ndv member must be an integer value"; + return 1; } - field->store_text(unescape_buf.ptr(), unescape_buf.length(), - &my_charset_bin); - value_buf.alloc(field->pack_length()); - uint bytes= field->get_key_image((uchar*)value_buf.ptr(), len_to_copy, - Field::itRAW); - last_bucket_end_endp.assign(value_buf.ptr(), bytes); - if (end_member_index == (size_t)-1) - end_member_index= buckets.size(); + have_ndv= true; + continue; + } + save1.restore_to(je); + + Json_string end_str("end"); + if (json_key_matches(je, end_str.get())) + { + if (read_bucket_endpoint(je, field, &value_buf, err)) + return 1; + last_bucket_end_endp.assign(value_buf.ptr(), value_buf.length()); + *assigned_last_end= true; + continue; } + save1.restore_to(je); + + // Some unknown member. Skip it. + if (json_skip_key(je)) + return 1; + } + + if (!have_start) + { + *err= "\"start\" element not present"; + return 1; + } + if (!have_size) + { + *err= "\"size\" element not present"; + return 1; + } + if (!have_ndv) + { + *err= "\"ndv\" element not present"; + return 1; + } + + *total_size += size_d; + + buckets.push_back({std::string(value_buf.ptr(), value_buf.length()), + *total_size, ndv_ll}); + + return 0; // Ok, continue reading +} + + +/* + @brief + Parse the histogram from its on-disk JSON representation + + @detail + See opt_histogram_json.h, class Histogram_json_hb for description of the + data format. + + @return + false OK + True Error +*/ + +bool Histogram_json_hb::parse(MEM_ROOT *mem_root, const char *db_name, + const char *table_name, Field *field, + Histogram_type type_arg, + const char *hist_data, size_t hist_data_len) +{ + json_engine_t je; + int rc; + const char *err= "JSON parse error"; + double total_size= 0.0; + int end_element= -1; + bool end_assigned; + DBUG_ENTER("Histogram_json_hb::parse"); + DBUG_ASSERT(type_arg == JSON_HB); + + Json_string hist_key_name(JSON_NAME); + json_scan_start(&je, &my_charset_utf8mb4_bin, + (const uchar*)hist_data, + (const uchar*)hist_data+hist_data_len); + + if (json_scan_next(&je)) + goto err; + + if (je.state != JST_OBJ_START) + { + err= "Root JSON element must be a JSON object"; + goto err; + } + + if (json_scan_next(&je)) + goto err; + + if (je.state != JST_KEY || !json_key_matches(&je, hist_key_name.get())) + { + err= "Root element must be histogram_hb_v2"; + goto err; + } + + if (json_scan_next(&je)) + goto err; + + if (je.state != JST_ARRAY_START) + { + err= "histogram_hb_v2 must contain an array"; + goto err; + } + + while (!(rc= parse_bucket(&je, field, &total_size, &end_assigned, &err))) + { + if (end_assigned && end_element != -1) + end_element= (int)buckets.size(); + } + + if (rc > 0) // Got error other than EOF + goto err; + + if (buckets.size() < 1) + { + err= "Histogram must have at least one bucket"; + goto err; } - size= buckets.size(); - if (end_member_index != buckets.size()) + if (end_element == -1) { - err= ".end must be present in the last bucket and only there"; - err_pos= hist_data; - goto error; + buckets.back().start_value= last_bucket_end_endp; } - if (!buckets.size()) + else if (end_element < (int)buckets.size()) { - err= ".end member is allowed only in last bucket"; - err_pos= hist_data; - goto error; + err= ".end is only allowed in the last bucket"; + goto err; } - DBUG_RETURN(false); -error: - my_error(ER_JSON_HISTOGRAM_PARSE_FAILED, MYF(0), err, err_pos - hist_data); + DBUG_RETURN(false); // Ok +err: + THD *thd= current_thd; + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, + ER_JSON_HISTOGRAM_PARSE_FAILED, + ER_THD(thd, ER_JSON_HISTOGRAM_PARSE_FAILED), + db_name, table_name, + err, (je.s.c_str - (const uchar*)hist_data)); DBUG_RETURN(true); } @@ -683,7 +829,7 @@ double Histogram_json_hb::range_selectivity(Field *field, key_range *min_endp, { double min, max; - if (min_endp && !(field->null_ptr && min_endp->key[0])) + if (min_endp && !(field->real_maybe_null() && min_endp->key[0])) { bool exclusive_endp= (min_endp->flag == HA_READ_AFTER_KEY)? true: false; const uchar *min_key= min_endp->key; @@ -721,7 +867,7 @@ double Histogram_json_hb::range_selectivity(Field *field, key_range *min_endp, if (max_endp) { // The right endpoint cannot be NULL - DBUG_ASSERT(!(field->null_ptr && max_endp->key[0])); + DBUG_ASSERT(!(field->real_maybe_null() && max_endp->key[0])); bool inclusive_endp= (max_endp->flag == HA_READ_AFTER_KEY)? true: false; const uchar *max_key= max_endp->key; uint max_key_len= max_endp->length; diff --git a/sql/opt_histogram_json.h b/sql/opt_histogram_json.h index a5499917971..a59100f42dd 100644 --- a/sql/opt_histogram_json.h +++ b/sql/opt_histogram_json.h @@ -76,7 +76,8 @@ class Histogram_json_hb : public Histogram_base public: static constexpr const char* JSON_NAME="histogram_hb_v2"; - bool parse(MEM_ROOT *mem_root, Field *field, Histogram_type type_arg, + bool parse(MEM_ROOT *mem_root, const char *db_name, const char *table_name, + Field *field, Histogram_type type_arg, const char *hist_data, size_t hist_data_len) override; void serialize(Field *field) override; @@ -122,6 +123,9 @@ class Histogram_json_hb : public Histogram_base } private: + int parse_bucket(json_engine_t *je, Field *field, double *cumulative_size, + bool *assigned_last_end, const char **err); + double get_left_fract(int idx); std::string& get_end_value(int idx); int find_bucket(const Field *field, const uchar *lookup_val, bool *equal); diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index b5b3e970f79..c2bd266cdd2 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7997,4 +7997,4 @@ ER_PARTITION_CONVERT_SUBPARTITIONED ER_PROVIDER_NOT_LOADED eng "MariaDB tried to use the %s, but its provider plugin is not loaded" ER_JSON_HISTOGRAM_PARSE_FAILED - eng "Failed to parse histogram: %s at offset %d." + eng "Failed to parse histogram for table %s.%s: %s at offset %d." diff --git a/sql/sql_statistics.cc b/sql/sql_statistics.cc index 8d08875e183..6b3ea834628 100644 --- a/sql/sql_statistics.cc +++ b/sql/sql_statistics.cc @@ -1233,7 +1233,8 @@ class Column_stat: public Stat_table if (!(hist= create_histogram(mem_root, hist_type, NULL))) return NULL; Field *field= table->field[table_field->field_index]; - if (!hist->parse(mem_root, field, hist_type, + if (!hist->parse(mem_root, db_name->str, table_name->str, + field, hist_type, val.ptr(), val.length())) { table_field->read_stats->histogram= hist; @@ -1247,9 +1248,9 @@ class Column_stat: public Stat_table }; -bool Histogram_binary::parse(MEM_ROOT *mem_root, Field*, - Histogram_type type_arg, const char *hist_data, - size_t hist_data_len) +bool Histogram_binary::parse(MEM_ROOT *mem_root, const char*, const char*, + Field*, Histogram_type type_arg, + const char *hist_data, size_t hist_data_len) { /* On-disk an in-memory formats are the same. Just copy the data. */ type= type_arg; diff --git a/sql/sql_statistics.h b/sql/sql_statistics.h index c5b1aa54399..14877417072 100644 --- a/sql/sql_statistics.h +++ b/sql/sql_statistics.h @@ -154,7 +154,9 @@ class Histogram_builder; class Histogram_base { public: - virtual bool parse(MEM_ROOT *mem_root, Field *field, Histogram_type type_arg, + virtual bool parse(MEM_ROOT *mem_root, + const char *db_name, const char *table_name, + Field *field, Histogram_type type_arg, const char *hist_data, size_t hist_data_len)= 0; virtual void serialize(Field *to_field)= 0; @@ -311,8 +313,9 @@ class Histogram_binary : public Histogram_base 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; + bool parse(MEM_ROOT *mem_root, const char*, const char*, 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;