MDEV-32854: Make JSON_DEPTH_LIMIT unlimited

The initial hard capped limit on the depth was 32. It was implemented using
static arrays of relevant type and size 32.
Hence, to implement unlimited depth, dynamic array on mem_root was
implemented which grows by 3200 as needed. Relevant arrays were replaced
with this dynamic array.

Author: mariadb-RuchaDeodhar

include/json_lib.h

@@ -7,8 +7,27 @@
 extern "C" {
 #endif
 
-#define JSON_DEPTH_LIMIT 32
+#define JSON_DEPTH_DEFAULT 32
+#define JSON_DEPTH_LIMIT 32 /* Still used in columnstore. */
+#define JSON_DEPTH_INC JSON_DEPTH_DEFAULT*100
 
+/*
+ Because this array will store approximate two arrays of
+ type json_path_step_t and one or two integer arrays,
+ each of average 70 elements. So this size should suffice.
+*/
+#define BLOCK_SIZE_JSON_DYN_ARRAY 4096
+
+#define get_json_step(p,s) if (p->last_step_idx < (int)(p->steps.max_element)) \
+  s= ((json_path_step_t*)(p->steps.buffer))+p->last_step_idx; \
+  else \
+  s= (json_path_step_t*) mem_root_dynamic_array_resize_and_get_val(&p->steps,  p->last_step_idx);
+
+#define set_json_array_value_ptr(idx, max_element, dyn_arr_ptr, val) \
+  if ((size_t)(idx) < (max_element)) \
+    memcpy((dyn_arr_ptr)->buffer + (dyn_arr_ptr)->size_of_element * (idx), &(val), sizeof(val)); \
+  else \
+    mem_root_dynamic_array_resize_and_set_val((dyn_arr_ptr), &(val), (idx));
 /*
   When error happens, the c_next of the JSON engine contains the
   character that caused the error, and the c_str is the position
@@ -28,7 +47,7 @@ enum json_errors {
 
   JE_ESCAPING= -6,     /* Error in the escaping. */
 
-  JE_DEPTH= -7,        /* The limit on the JSON depth was overrun. */
+  JE_DEPTH= -7,        /* The limit on the JSON depth was overrun. Still used in columnstore*/
 };
 
 
@@ -104,8 +123,8 @@ typedef struct st_json_path_step_t
 typedef struct st_json_path_t
 {
   json_string_t s;  /* The string to be parsed. */
-  json_path_step_t steps[JSON_DEPTH_LIMIT]; /* Steps of the path. */
-  json_path_step_t *last_step; /* Points to the last step. */
+  MEM_ROOT_DYNAMIC_ARRAY steps; /* Steps of the path. */
+  int last_step_idx;
 
   int mode_strict; /* TRUE if the path specified as 'strict' */
   enum json_path_step_types types_used; /* The '|' of all step's 'type'-s */
@@ -225,8 +244,8 @@ typedef struct st_json_engine_t
   const uchar *value_end; /* Points to the next character after the value. */
   int value_len; /* The length of the value. Does not count quotations for */
                  /* string constants. */
-
-  int stack[JSON_DEPTH_LIMIT]; /* Keeps the stack of nested JSON structures. */
+  /* Keeps the stack of nested JSON structures. */
+  MEM_ROOT_DYNAMIC_ARRAY stack;
   int stack_p;                 /* The 'stack' pointer. */
   volatile uchar *killed_ptr;
 } json_engine_t;
@@ -341,6 +360,13 @@ int json_skip_level_and_count(json_engine_t *j, int *n_items_skipped);
 */
 #define json_value_scalar(je)  ((je)->value_type > JSON_VALUE_ARRAY)
 
+#define report_json_error(js, je, n_param) \
+  report_json_error_ex(js->ptr(), je, func_name(), n_param, \
+      Sql_condition::WARN_LEVEL_WARN)
+
+#define report_path_error(js, je, n_param) \
+  report_path_error_ex(js->ptr(), je, func_name(), n_param,\
+      Sql_condition::WARN_LEVEL_WARN)
 
 /*
   Look for the JSON PATH in the json string.
@@ -350,7 +376,7 @@ int json_skip_level_and_count(json_engine_t *j, int *n_items_skipped);
   initialized with the JSON string, and the json_path_t with the JSON path
   appropriately. The 'p_cur_step' should point at the first
   step of the path.
-  The 'array_counters' is the array of JSON_DEPTH_LIMIT size.
+  The 'array_counters' is the array of 'curr_json_depth_limit' size.
   It stores the array counters of the parsed JSON.
   If function returns 0, it means it found the match. The position of
   the match is je->s.c_str. Then we can call the json_find_path()
@@ -360,7 +386,7 @@ int json_skip_level_and_count(json_engine_t *j, int *n_items_skipped);
 */
 int json_find_path(json_engine_t *je,
                    json_path_t *p, json_path_step_t **p_cur_step,
-                   int *array_counters);
+                   MEM_ROOT_DYNAMIC_ARRAY *array_counters);
 
 
 typedef struct st_json_find_paths_t
@@ -369,7 +395,7 @@ typedef struct st_json_find_paths_t
   json_path_t *paths;
   uint cur_depth;
   uint *path_depths;
-  int array_counters[JSON_DEPTH_LIMIT];
+  MEM_ROOT_DYNAMIC_ARRAY array_counters;
 } json_find_paths_t;
 
 
@@ -431,17 +457,22 @@ int json_get_path_start(json_engine_t *je, CHARSET_INFO *i_cs,
 int json_get_path_next(json_engine_t *je, json_path_t *p);
 
 int json_path_compare(const json_path_t *a, const json_path_t *b,
-                      enum json_value_types vt, const int* array_size_counter);
+                      enum json_value_types vt,
+                      MEM_ROOT_DYNAMIC_ARRAY* array_size_counter);
 
-int json_valid(const char *js, size_t js_len, CHARSET_INFO *cs);
+int json_valid(const char *js, size_t js_len,
+               CHARSET_INFO *cs, json_engine_t *je);
 
-int json_locate_key(const char *js, const char *js_end,
+int json_locate_key(json_engine_t *je, const char *js, const char *js_end,
                     const char *kname,
                     const char **key_start, const char **key_end,
                     int *comma_pos);
 
 int json_normalize(DYNAMIC_STRING *result,
-                   const char *s, size_t size, CHARSET_INFO *cs);
+                   const char *s, size_t size, CHARSET_INFO *cs,
+                   MEM_ROOT *current_mem_root,
+                   json_engine_t *temp_je,
+                   MEM_ROOT_DYNAMIC_ARRAY *stack);
 
 int json_skip_array_and_count(json_engine_t *j, int* n_item);
 
@@ -450,6 +481,8 @@ inline static int json_scan_ended(json_engine_t *j)
   return (j->state == JST_ARRAY_END && j->stack_p == 0);
 }
 
+void initJsonArray(MEM_ROOT *mem_root, MEM_ROOT_DYNAMIC_ARRAY *mem_root_array, size_t size, void *buffer, myf myflag);
+
 #ifdef  __cplusplus
 }
 #endif

include/my_sys.h

@@ -89,6 +89,7 @@ C_MODE_START
 #define MY_FREE_ON_ERROR 128U	/* my_realloc() ; Free old ptr on error */
 #define MY_DONT_OVERWRITE_FILE 2048U /* my_copy: Don't overwrite file */
 #define MY_THREADSAFE 2048U     /* my_seek(): lock fd mutex */
+#define MY_BUFFER_NO_RESIZE 512U
 #define MY_SYNC       4096U     /* my_copy(): sync dst file */
 #define MY_SYNC_DIR   32768U    /* my_create/delete/rename: sync directory */
 #define MY_THREAD_SPECIFIC 0x10000U /* my_malloc(): thread specific */
@@ -362,6 +363,17 @@ typedef struct st_dynamic_array
   myf malloc_flags;
 } DYNAMIC_ARRAY;
 
+typedef struct st_mem_root_dynamic_array
+{
+  MEM_ROOT *mem_root;
+  uchar *buffer;
+  size_t elements, max_element;
+  size_t alloc_increment;
+  size_t size_of_element;
+  PSI_memory_key m_psi_key;
+  myf malloc_flags;
+} MEM_ROOT_DYNAMIC_ARRAY;
+
 
 typedef struct st_dynamic_array_append
 {
@@ -1176,6 +1188,74 @@ extern void thd_increment_bytes_sent(void *thd, size_t length);
 extern void thd_increment_bytes_received(void *thd, size_t length);
 extern void thd_increment_net_big_packet_count(void *thd, size_t length);
 
+extern int mem_root_dynamic_array_init(MEM_ROOT *mem_root,
+                                       PSI_memory_key psi_key,
+                                       MEM_ROOT_DYNAMIC_ARRAY *array,
+                                       size_t element_size, void *init_buffer,
+                                       size_t init_alloc,
+                                       size_t alloc_increment,
+                                       myf my_flags);
+int mem_root_allocate_dynamic(MEM_ROOT *mem_root,
+                              MEM_ROOT_DYNAMIC_ARRAY *array,
+                              size_t idx);
+extern void* mem_root_dynamic_array_get_val(MEM_ROOT_DYNAMIC_ARRAY *array, size_t idx);
+extern void mem_root_dynamic_array_reset(MEM_ROOT_DYNAMIC_ARRAY *array);
+extern int mem_root_dynamic_array_resize_not_allowed(MEM_ROOT_DYNAMIC_ARRAY *array);
+extern void mem_root_dynamic_array_copy_values(MEM_ROOT_DYNAMIC_ARRAY *dest, MEM_ROOT_DYNAMIC_ARRAY *src);
+static inline int mem_root_dynamic_array_set_val(MEM_ROOT_DYNAMIC_ARRAY *array,
+                                   const void *element, size_t idx)
+{
+  DBUG_ASSERT(idx < array->max_element);
+
+  memcpy(array->buffer+(idx * array->size_of_element), element,
+         array->size_of_element);
+  return TRUE;
+}
+static inline int mem_root_dynamic_array_resize_and_set_val(MEM_ROOT_DYNAMIC_ARRAY *array,
+                                   const void *element, size_t idx)
+{
+  if (array->malloc_flags & MY_BUFFER_NO_RESIZE)
+    return TRUE;
+
+  if (idx >= array->max_element)
+  {
+    if (mem_root_allocate_dynamic(array->mem_root, array, idx))
+      return 1;
+    array->elements++;
+  }
+
+  /*
+     Ensure the array size has increased and the index is
+     now well within the array bounds.
+  */
+  DBUG_ASSERT(idx < array->max_element);
+
+  memcpy(array->buffer+(idx * array->size_of_element), element,
+         array->size_of_element);
+
+  return FALSE;
+}
+
+static inline void* mem_root_dynamic_array_resize_and_get_val(MEM_ROOT_DYNAMIC_ARRAY *array, size_t idx)
+{
+  if (array->malloc_flags & MY_BUFFER_NO_RESIZE)
+    return NULL;
+
+  if (idx >= array->max_element)
+  {
+    if (mem_root_allocate_dynamic(array->mem_root, array, idx))
+      return NULL;
+  }
+
+  /*
+     Ensure the array size has increased and the index is
+     now well within the array bounds.
+  */
+  DBUG_ASSERT(idx < array->max_element);
+
+  return mem_root_dynamic_array_get_val(array, idx);
+}
+
 #include <mysql/psi/psi.h>
 
 #ifdef HAVE_PSI_INTERFACE

mysql-test/main/func_json.result

@@ -640,24 +640,20 @@ ex
 set @save_max_allowed_packet=@@max_allowed_packet;
 set @save_net_buffer_length=@@net_buffer_length;
 set @@global.net_buffer_length=1024;
-set @@global.max_allowed_packet=2048;
+set @@global.max_allowed_packet=4096;
 connect  newconn, localhost, root,,;
 show variables like 'net_buffer_length';
 Variable_name	Value
 net_buffer_length	1024
 show variables like 'max_allowed_packet';
 Variable_name	Value
-max_allowed_packet	2048
+max_allowed_packet	4096
 select json_array(repeat('a',1024),repeat('a',1024)) as ex;
 ex
-NULL
-Warnings:
-Warning	1301	Result of json_array() was larger than max_allowed_packet (2048) - truncated
+["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"]
 select json_object("a", repeat('a',1024),"b", repeat('a',1024)) as ex;
 ex
-NULL
-Warnings:
-Warning	1301	Result of json_object() was larger than max_allowed_packet (2048) - truncated
+{"a": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "b": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}
 connection default;
 set @@global.max_allowed_packet = @save_max_allowed_packet;
 set @@global.net_buffer_length = @save_net_buffer_length;
@@ -4842,16 +4838,16 @@ JSON_SCHEMA_VALID(@schema_array, '[')
 0
 Warnings:
 Warning	4037	Unexpected end of JSON text in argument 2 to function 'json_schema_valid'
-SELECT JSON_SCHEMA_VALID(repeat('[', 100000), json_object());
-JSON_SCHEMA_VALID(repeat('[', 100000), json_object())
+SELECT JSON_SCHEMA_VALID(repeat('[', 100), json_object());
+JSON_SCHEMA_VALID(repeat('[', 100), json_object())
 NULL
 Warnings:
-Warning	4040	Limit of 32 on JSON nested structures depth is reached in argument 1 to function 'json_schema_valid' at position 32
-SELECT JSON_SCHEMA_VALID(json_object(), repeat('[', 10000000));
-JSON_SCHEMA_VALID(json_object(), repeat('[', 10000000))
+Warning	4037	Unexpected end of JSON text in argument 1 to function 'json_schema_valid'
+SELECT JSON_SCHEMA_VALID(json_object(), repeat('[', 100));
+JSON_SCHEMA_VALID(json_object(), repeat('[', 100))
 0
 Warnings:
-Warning	4040	Limit of 32 on JSON nested structures depth is reached in argument 2 to function 'json_schema_valid' at position 32
+Warning	4037	Unexpected end of JSON text in argument 2 to function 'json_schema_valid'
 #
 # MDEV-30677: Incorrect result for "SELECT JSON_SCHEMA_VALID('{}', NULL)"
 #
@@ -4895,6 +4891,8 @@ NULL
 SELECT JSON_KEY_VALUE('', '$.a');
 JSON_KEY_VALUE('', '$.a')
 NULL
+Warnings:
+Warning	4037	Unexpected end of JSON text in argument 1 to function 'json_key_value'
 SELECT JSON_KEY_VALUE('[1,2,3]', '');
 JSON_KEY_VALUE('[1,2,3]', '')
 NULL

mysql-test/main/func_json.test

@@ -310,7 +310,7 @@ set @save_max_allowed_packet=@@max_allowed_packet;
 set @save_net_buffer_length=@@net_buffer_length;
 
 set @@global.net_buffer_length=1024;
-set @@global.max_allowed_packet=2048;
+set @@global.max_allowed_packet=4096;
 --connect (newconn, localhost, root,,)
 
 show variables like 'net_buffer_length';
@@ -3800,10 +3800,10 @@ SET @schema_array= '{"type":"array"}';
 SELECT JSON_SCHEMA_VALID(@schema_array, '[');
 
 --disable_view_protocol
-SELECT JSON_SCHEMA_VALID(repeat('[', 100000), json_object());
+SELECT JSON_SCHEMA_VALID(repeat('[', 100), json_object());
 --enable_view_protocol
 
-SELECT JSON_SCHEMA_VALID(json_object(), repeat('[', 10000000));
+SELECT JSON_SCHEMA_VALID(json_object(), repeat('[', 100));
 
 --echo #
 --echo # MDEV-30677: Incorrect result for "SELECT JSON_SCHEMA_VALID('{}', NULL)"

mysql-test/main/json_equals.result

@@ -65,7 +65,7 @@ select json_equals('{"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"ob
 select json_equals('{"obj":{"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"key": "value"}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}',
 '{"obj":{"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"obj": {"key": "value"}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}') as 32_levels;
 32_levels
-NULL
+1
 #
 # test values from different charset
 # (UTF-8 two-bytes vs. latin1 single high-byte)