Rename histogram_hb_v2 -> histogram_hb

mysql-test/main/statistics_json.test

@@ -49,48 +49,48 @@ FLUSH TABLES;
 explain select * from t1_json limit 1;
 
 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;
 explain select * from t1_json limit 1;
 
 UPDATE mysql.column_stats 
-SET histogram='{"histogram_hb_v2":["not-a-bucket"]}'
+SET histogram='{"histogram_hb":["not-a-bucket"]}'
 WHERE table_name='t1_json';
 FLUSH TABLES;
 explain select * from t1_json limit 1;
 
 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';
 FLUSH TABLES;
 explain select * from t1_json limit 1;
 
 UPDATE mysql.column_stats 
-SET histogram='{"histogram_hb_v2":[{"start":{}}]}'
+SET histogram='{"histogram_hb":[{"start":{}}]}'
 WHERE table_name='t1_json';
 FLUSH TABLES;
 explain select * from t1_json limit 1;
 
 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';
 FLUSH TABLES;
 explain select * from t1_json limit 1;
 
 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';
 FLUSH TABLES;
 explain select * from t1_json limit 1;
 
 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';
 FLUSH TABLES;
 explain select * from t1_json limit 1;
 
 UPDATE mysql.column_stats 
-SET histogram='{"histogram_hb_v2":[]}'
+SET histogram='{"histogram_hb":[]}'
 WHERE table_name='t1_json';
 FLUSH TABLES;
 explain select * from t1_json limit 1;

sql/opt_histogram_json.cc

@@ -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()))
   {
-    err= "Root element must be histogram_hb_v2";
+    err= "Root element must be histogram_hb";
     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)
   {
-    err= "histogram_hb_v2 must contain an array";
+    err= "histogram_hb must contain an array";
     goto err;
   }
 

sql/opt_histogram_json.h

@@ -24,7 +24,7 @@
   Histogram format in JSON:
 
   {
-    "histogram_hb_v2": [
+    "histogram_hb": [
       { "start": "value", "size":nnn.nn, "ndv": nnn },
       ...
       { "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;
 
 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,
              Field *field, Histogram_type type_arg,