1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename histogram_hb_v2 -> histogram_hb

Browse Source
This commit is contained in:
Sergei Petrunia 2021-12-02 14:38:51 +03:00
parent 1d14176ec4
commit a0f93f433a
4 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -49,48 +49,48 @@ FLUSH TABLES;
explain select * from t1_json limit 1; explain select * from t1_json limit 1;
UPDATE mysql.column_stats UPDATE mysql.column_stats
SET histogram='{"histogram_hb_v2":"not-histogram"}' WHERE table_name='t1_json'; SET histogram='{"histogram_hb":"not-histogram"}' WHERE table_name='t1_json';
FLUSH TABLES; FLUSH TABLES;
explain select * from t1_json limit 1; explain select * from t1_json limit 1;
UPDATE mysql.column_stats UPDATE mysql.column_stats
SET histogram='{"histogram_hb_v2":["not-a-bucket"]}' SET histogram='{"histogram_hb":["not-a-bucket"]}'
WHERE table_name='t1_json'; WHERE table_name='t1_json';
FLUSH TABLES; FLUSH TABLES;
explain select * from t1_json limit 1; explain select * from t1_json limit 1;
UPDATE mysql.column_stats UPDATE mysql.column_stats
SET histogram='{"histogram_hb_v2":[{"no-expected-members":1}]}' SET histogram='{"histogram_hb":[{"no-expected-members":1}]}'
WHERE table_name='t1_json'; WHERE table_name='t1_json';
FLUSH TABLES; FLUSH TABLES;
explain select * from t1_json limit 1; explain select * from t1_json limit 1;
UPDATE mysql.column_stats UPDATE mysql.column_stats
SET histogram='{"histogram_hb_v2":[{"start":{}}]}' SET histogram='{"histogram_hb":[{"start":{}}]}'
WHERE table_name='t1_json'; WHERE table_name='t1_json';
FLUSH TABLES; FLUSH TABLES;
explain select * from t1_json limit 1; explain select * from t1_json limit 1;
UPDATE mysql.column_stats UPDATE mysql.column_stats
SET histogram='{"histogram_hb_v2":[{"start":"aaa", "size":"not-an-integer"}]}' SET histogram='{"histogram_hb":[{"start":"aaa", "size":"not-an-integer"}]}'
WHERE table_name='t1_json'; WHERE table_name='t1_json';
FLUSH TABLES; FLUSH TABLES;
explain select * from t1_json limit 1; explain select * from t1_json limit 1;
UPDATE mysql.column_stats UPDATE mysql.column_stats
SET histogram='{"histogram_hb_v2":[{"start":"aaa", "size":0.25}]}' SET histogram='{"histogram_hb":[{"start":"aaa", "size":0.25}]}'
WHERE table_name='t1_json'; WHERE table_name='t1_json';
FLUSH TABLES; FLUSH TABLES;
explain select * from t1_json limit 1; explain select * from t1_json limit 1;
UPDATE mysql.column_stats UPDATE mysql.column_stats
SET histogram='{"histogram_hb_v2":[{"start":"aaa", "size":0.25, "ndv":1}]}' SET histogram='{"histogram_hb":[{"start":"aaa", "size":0.25, "ndv":1}]}'
WHERE table_name='t1_json'; WHERE table_name='t1_json';
FLUSH TABLES; FLUSH TABLES;
explain select * from t1_json limit 1; explain select * from t1_json limit 1;
UPDATE mysql.column_stats UPDATE mysql.column_stats
SET histogram='{"histogram_hb_v2":[]}' SET histogram='{"histogram_hb":[]}'
WHERE table_name='t1_json'; WHERE table_name='t1_json';
FLUSH TABLES; FLUSH TABLES;
explain select * from t1_json limit 1; explain select * from t1_json limit 1;

4
sql/opt_histogram_json.cc
View File

@ -650,7 +650,7 @@ bool Histogram_json_hb::parse(MEM_ROOT *mem_root, const char *db_name,
if (je.state != JST_KEY || !json_key_matches(&je, hist_key_name.get())) if (je.state != JST_KEY || !json_key_matches(&je, hist_key_name.get()))
{ {
err= "Root element must be histogram_hb_v2"; err= "Root element must be histogram_hb";
goto err; goto err;
} }
@ -659,7 +659,7 @@ bool Histogram_json_hb::parse(MEM_ROOT *mem_root, const char *db_name,
if (je.state != JST_ARRAY_START) if (je.state != JST_ARRAY_START)
{ {
err= "histogram_hb_v2 must contain an array"; err= "histogram_hb must contain an array";
goto err; goto err;
} }

4
sql/opt_histogram_json.h
View File

@ -24,7 +24,7 @@
Histogram format in JSON: Histogram format in JSON:
{ {
"histogram_hb_v2": [ "histogram_hb": [
{ "start": "value", "size":nnn.nn, "ndv": nnn }, { "start": "value", "size":nnn.nn, "ndv": nnn },
... ...
{ "start": "value", "size":nnn.nn, "ndv": nnn, "end": "value"} { "start": "value", "size":nnn.nn, "ndv": nnn, "end": "value"}
@ -74,7 +74,7 @@ class Histogram_json_hb : public Histogram_base
std::string last_bucket_end_endp; std::string last_bucket_end_endp;
public: public:
static constexpr const char* JSON_NAME="histogram_hb_v2"; static constexpr const char* JSON_NAME="histogram_hb";
bool parse(MEM_ROOT *mem_root, const char *db_name, const char *table_name, bool parse(MEM_ROOT *mem_root, const char *db_name, const char *table_name,
Field *field, Histogram_type type_arg, Field *field, Histogram_type type_arg,