MDEV-36986: Support tracing array of primitive types

Json_writer had two separate code paths: add_unquoted_str() for
numbers/bool/null, and add_escaped_str() which added the surrounding
quotes itself for strings. Single_line_formatting_helper, which
buffers consecutive array/object elements to decide if they fit on
one line, assumed only strings could ever be buffered and always
wrapped the flushed values in quotes. As a result, arrays of numbers
(e.g. "depends_on_map_bits", "rec_per_key") were incorrectly rendered
with their elements quoted as strings.

Unify both paths into add_escaped_quoted_str(): the caller now hands
over bytes that are already in their final on-the-wire form. String
escaping (json_escape_to_string) writes its own surrounding quotes,
while numbers/bool/null are passed through unquoted, so the one-line
helper just concatenates the buffered payloads on flush instead of
adding quotes itself. A DBUG_ASSERT in add_escaped_quoted_str() now
checks that every payload is already a quoted string or a bare
number/bool/null token, so a caller that violates the contract trips
an assertion in debug builds instead of silently producing invalid
JSON.

Also:
- Fix Json_writer_array::add(ulonglong)/(size_t), which went through
  add_ll() with a cast to longlong and corrupted large unsigned
  values (e.g. ULLONG_MAX); route them through add_ull() instead.
- Fix mysql-test/include/opt_context_schema.inc: "subquery_runs" was
  nested inside the preceding object instead of being a sibling
  member, and "rec_per_key" items are now declared as "number" to
  match the corrected output.
- Update recorded .result files for opt_trace, opt_context_*, and
  subselect_mat_analyze_json to reflect numbers/booleans no longer
  being quoted inside JSON arrays.
- Extend unittest/sql/my_json_writer-t.cc with coverage for arrays
  of primitives: plain integers, mixed types, sizes, multi-line
  arrays, values flushed before a nested object, strings that were
  already escaped by the one-line buffer, and invalid utf8mb4 input
  through add_str().
- Rewrite the "multi-line array of integers" test to actually
  overflow the one-line buffer (9 seven-digit numbers instead of 7),
  since the previous version fit on one line and never exercised the
  element-per-line flush path it claimed to test.
- Drop the now-redundant single-argument add_escaped_quoted_str()
  overload; all call sites already know their length.
- Update json_escape_to_string()'s doc comments (my_json_writer.h,
  sql_json_lib.h) to state that it quotes its output, not just
  escapes it.

Author: bsrikanth-mariadb

mysql-test/include/opt_context_schema.inc

@@ -46,7 +46,7 @@ let $opt_context_schema=
                 "rec_per_key": {
                   "type": "array",
                   "items": {
-                    "type": "string"
+                    "type": "number"
                   }
                 }
               },
@@ -197,13 +197,14 @@ let $opt_context_schema=
                 "copy_cost"
               ]
             }
-          }
+          },
           "subquery_runs": {
             "type": "array",
             "uniqueItems": true,
             "minItems": 1,
             "items": {
               "type": "number"
+            }
           }
         },
         "required": [

mysql-test/main/join_outer_reorder.result

@@ -62,14 +62,14 @@ DEPS
             "row_may_be_null": true,
             "map_bit": 1,
             "depends_on_map_bits": 
-            ["0"]
+            [0]
         },
         {
             "table": "t2",
             "row_may_be_null": true,
             "map_bit": 2,
             "depends_on_map_bits": 
-            ["0"]
+            [0]
         }
     ]
 ]
@@ -103,14 +103,14 @@ DEPS
             "row_may_be_null": true,
             "map_bit": 1,
             "depends_on_map_bits": 
-            ["0"]
+            [0]
         },
         {
             "table": "t3",
             "row_may_be_null": true,
             "map_bit": 2,
             "depends_on_map_bits": 
-            ["0"]
+            [0]
         }
     ]
 ]
@@ -142,16 +142,16 @@ DEPS
             "row_may_be_null": true,
             "map_bit": 1,
             "depends_on_map_bits": 
-            ["0"]
+            [0]
         },
         {
             "table": "t3",
             "row_may_be_null": true,
             "map_bit": 2,
             "depends_on_map_bits": 
             [
-                "0",
-                "1"
+                0,
+                1
             ]
         }
     ]
@@ -193,28 +193,28 @@ DEPS
             "row_may_be_null": true,
             "map_bit": 1,
             "depends_on_map_bits": 
-            ["0"]
+            [0]
         },
         {
             "table": "t4_2",
             "row_may_be_null": true,
             "map_bit": 2,
             "depends_on_map_bits": 
-            ["0"]
+            [0]
         },
         {
             "table": "t3",
             "row_may_be_null": true,
             "map_bit": 3,
             "depends_on_map_bits": 
-            ["0"]
+            [0]
         },
         {
             "table": "t4_3",
             "row_may_be_null": true,
             "map_bit": 4,
             "depends_on_map_bits": 
-            ["0"]
+            [0]
         }
     ]
 ]

mysql-test/main/opt_context_load_stats_basic.result

@@ -278,7 +278,7 @@ set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].name');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "name" element not present at offset 1583.
+Warning	4269	Failed to parse saved optimizer context: "name" element not present at offset 1575.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].ddl');
 select * from t1 where a > 10;
 a	b
@@ -289,12 +289,12 @@ set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].file_stat_record
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "file_stat_records" element not present at offset 1576.
+Warning	4269	Failed to parse saved optimizer context: "file_stat_records" element not present at offset 1568.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].indexes[0].index_name');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "index_name" element not present at offset 211.
+Warning	4269	Failed to parse saved optimizer context: "index_name" element not present at offset 209.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].indexes[0].rec_per_key');
 select * from t1 where a > 10;
 a	b
@@ -304,37 +304,37 @@ set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].multi_range_read
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "index_name" element not present at offset 744.
+Warning	4269	Failed to parse saved optimizer context: "index_name" element not present at offset 736.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].multi_range_read_info_const_calls[0].ranges');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "ranges" element not present at offset 736.
+Warning	4269	Failed to parse saved optimizer context: "ranges" element not present at offset 728.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].multi_range_read_info_const_calls[0].num_rows');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "num_rows" element not present at offset 754.
+Warning	4269	Failed to parse saved optimizer context: "num_rows" element not present at offset 746.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].multi_range_read_info_const_calls[0].cost');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "cost" element not present at offset 538.
+Warning	4269	Failed to parse saved optimizer context: "cost" element not present at offset 530.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].multi_range_read_info_const_calls[0].max_index_blocks');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "max_index_blocks" element not present at offset 747.
+Warning	4269	Failed to parse saved optimizer context: "max_index_blocks" element not present at offset 739.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].multi_range_read_info_const_calls[0].max_row_blocks');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "max_row_blocks" element not present at offset 749.
+Warning	4269	Failed to parse saved optimizer context: "max_row_blocks" element not present at offset 741.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].multi_range_read_info_const_calls[0].call_number');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "call_number" element not present at offset 752.
+Warning	4269	Failed to parse saved optimizer context: "call_number" element not present at offset 744.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].indexes[0]');
 select * from t1 where a > 10;
 a	b
@@ -376,51 +376,51 @@ set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].cost_for_index_r
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "index_name" element not present at offset 621.
+Warning	4269	Failed to parse saved optimizer context: "index_name" element not present at offset 613.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].cost_for_index_read_calls[0].num_records');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "num_records" element not present at offset 629.
+Warning	4269	Failed to parse saved optimizer context: "num_records" element not present at offset 621.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].cost_for_index_read_calls[0].eq_ref');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "eq_ref" element not present at offset 634.
+Warning	4269	Failed to parse saved optimizer context: "eq_ref" element not present at offset 626.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].cost_for_index_read_calls[0].index_cost_io');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "index_cost_io" element not present at offset 627.
+Warning	4269	Failed to parse saved optimizer context: "index_cost_io" element not present at offset 619.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].cost_for_index_read_calls[0].index_cost_cpu');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "index_cost_cpu" element not present at offset 616.
+Warning	4269	Failed to parse saved optimizer context: "index_cost_cpu" element not present at offset 608.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].cost_for_index_read_calls[0].row_cost_io');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "row_cost_io" element not present at offset 629.
+Warning	4269	Failed to parse saved optimizer context: "row_cost_io" element not present at offset 621.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].cost_for_index_read_calls[0].row_cost_cpu');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "row_cost_cpu" element not present at offset 618.
+Warning	4269	Failed to parse saved optimizer context: "row_cost_cpu" element not present at offset 610.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].cost_for_index_read_calls[0].max_index_blocks');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "max_index_blocks" element not present at offset 624.
+Warning	4269	Failed to parse saved optimizer context: "max_index_blocks" element not present at offset 616.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].cost_for_index_read_calls[0].max_row_blocks');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "max_row_blocks" element not present at offset 626.
+Warning	4269	Failed to parse saved optimizer context: "max_row_blocks" element not present at offset 618.
 set @opt_context=json_remove(@saved_opt_context_1, '$.tables[0].cost_for_index_read_calls[0].copy_cost');
 select * from t1 where a > 10;
 a	b
 Warnings:
-Warning	4269	Failed to parse saved optimizer context: "copy_cost" element not present at offset 631.
+Warning	4269	Failed to parse saved optimizer context: "copy_cost" element not present at offset 623.
 drop table t1;
 drop database db1;

mysql-test/main/opt_context_store_stats.result

@@ -52,7 +52,7 @@ count(*)
 # === Tables
 # Tables in the context
 table_name	file_stat_records	index_name	rec_per_key
-db1.t2	30	t2_idx_a	["5"]
+db1.t2	30	t2_idx_a	[5]
 db1.t1	20	NULL	NULL
 # === Range accesses
 index_name	ranges	num_rows	max_index_blocks	max_row_blocks
@@ -83,7 +83,7 @@ a	b	c
 # === Tables
 # Tables in the context
 table_name	file_stat_records	index_name	rec_per_key
-db1.t2	30	t2_idx_a	["5"]
+db1.t2	30	t2_idx_a	[5]
 db1.t1	20	NULL	NULL
 # === Range accesses
 index_name	ranges	num_rows	max_index_blocks	max_row_blocks
@@ -114,7 +114,7 @@ insert into t1 (select t2.a as a, t2.a as b from t2);
 # === Tables
 # Tables in the context
 table_name	file_stat_records	index_name	rec_per_key
-db1.t2	30	t2_idx_a	["5"]
+db1.t2	30	t2_idx_a	[5]
 db1.t1	20	NULL	NULL
 # === Range accesses
 index_name	ranges	num_rows	max_index_blocks	max_row_blocks
@@ -568,7 +568,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 # === Tables
 # Tables in the context
 table_name	file_stat_records	index_name	rec_per_key
-test.t1	3	a	["1"]
+test.t1	3	a	[1]
 # === Range accesses
 index_name	ranges	num_rows	max_index_blocks	max_row_blocks
 # == End of optimizer context

mysql-test/main/opt_trace.result

@@ -2700,7 +2700,7 @@ select t1.a from t1 left join t2 on t1.a=t2.a	{
                 "table": "t2",
                 "row_may_be_null": true,
                 "map_bit": 1,
-                "depends_on_map_bits": ["0"]
+                "depends_on_map_bits": [0]
               }
             ]
           },
@@ -2856,7 +2856,7 @@ explain select * from t1 left join t2 on t2.a=t1.a	{
                 "table": "t2",
                 "row_may_be_null": true,
                 "map_bit": 1,
-                "depends_on_map_bits": ["0"]
+                "depends_on_map_bits": [0]
               }
             ]
           },
@@ -3090,13 +3090,13 @@ explain select t1.a from t1 left join (t2 join t3 on t2.b=t3.b) on t2.a=t1.a and
                 "table": "t2",
                 "row_may_be_null": true,
                 "map_bit": 1,
-                "depends_on_map_bits": ["0"]
+                "depends_on_map_bits": [0]
               },
               {
                 "table": "t3",
                 "row_may_be_null": true,
                 "map_bit": 2,
-                "depends_on_map_bits": ["0"]
+                "depends_on_map_bits": [0]
               }
             ]
           },

mysql-test/main/subselect_mat_analyze_json.result

@@ -853,7 +853,7 @@ ANALYZE
           "r_loops": 1,
           "r_partial_matches": 1,
           "r_partial_match_buffer_size": "REPLACED",
-          "r_partial_match_array_sizes": ["4", "3"],
+          "r_partial_match_array_sizes": [4, 3],
           "query_block": {
             "select_id": 2,
             "cost": "REPLACED",
@@ -1143,7 +1143,7 @@ ANALYZE
           "r_loops": 1,
           "r_partial_matches": 1,
           "r_partial_match_buffer_size": "REPLACED",
-          "r_partial_match_array_sizes": ["4", "3"],
+          "r_partial_match_array_sizes": [4, 3],
           "query_block": {
             "select_id": 2,
             "cost": "REPLACED",
@@ -1206,7 +1206,7 @@ ANALYZE
           "r_loops": 1,
           "r_partial_matches": 1,
           "r_partial_match_buffer_size": "REPLACED",
-          "r_partial_match_array_sizes": ["4", "3"],
+          "r_partial_match_array_sizes": [4, 3],
           "query_block": {
             "select_id": 2,
             "cost": "REPLACED",