database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-10 01:22:48 +03:00
Code Activity

MDEV-32854: Make JSON_DEPTH_LIMIT unlimited

Browse Source 
This patch is the columnstore-part of the task. Columnstore wanted to have
previous 32 depth, so this patch aims at keeping the compatibility.
This commit is contained in:
Rucha Deodhar
2025-05-22 15:42:12 +05:30
parent 9ab6330ef7
commit f4dfde6992
26 changed files with 526 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
utils/funcexp/func_json_array_insert.cpp
View File

@@ -1,6 +1,8 @@
#include "functor_json.h"
#include "functioncolumn.h"
#include "constantcolumn.h"
#include "json_lib.h"
#include "my_sys.h"
using namespace execplan;
#include "rowgroup.h"
@@ -31,10 +33,21 @@ string Func_json_array_insert::getStrVal(rowgroup::Row& row, FunctionParm& fp, b
json_engine_t jsEg;
string retJS;
retJS.reserve(js.length() + 8);
retJS.reserve(js.length() + 8);
initJSPaths(paths, fp, 1, 2);
#if MYSQL_VERSION_ID >= 120100
int jsEg_stack[JSON_DEPTH_LIMIT];
initJsonArray(&jsEg.stack, sizeof(int), &jsEg_stack);
for (size_t i=0; i<paths.size(); i++)
{
JSONPath& path = paths[i];
initJsonArray(&path.p.steps, sizeof(json_path_step_t), &p_steps_arr[i]);
}
#endif
utils::NullString tmpJS(js);
for (size_t i = 1, j = 0; i < fp.size(); i += 2, j++)
{
@@ -43,19 +56,34 @@ string Func_json_array_insert::getStrVal(rowgroup::Row& row, FunctionParm& fp, b
JSONPath& path = paths[j];
if (!path.parsed)
{
if (parseJSPath(path, row, fp[i]) || path.p.last_step - 1 < path.p.steps ||
#if MYSQL_VERSION_ID >= 120100
json_path_step_t *last_step= reinterpret_cast<json_path_step_t*>(mem_root_dynamic_array_get_val(&path.p.steps, path.p.last_step_idx)),
*initial_step= reinterpret_cast<json_path_step_t*>(path.p.steps.buffer);
#endif
#if MYSQL_VERSION_ID >= 120100
if (parseJSPath(path, row, fp[i]) || (last_step - 1) < initial_step ||
last_step->type != JSON_PATH_ARRAY)
#else
if (parseJSPath(path, row, fp[i]) || path.p.last_step - 1 < path.p.steps ||
path.p.last_step->type != JSON_PATH_ARRAY)
#endif
{
if (path.p.s.error == 0)
path.p.s.error = SHOULD_END_WITH_ARRAY;
goto error;
}
#if MYSQL_VERSION_ID >= 120100
path.p.last_step_idx--;
#else
path.p.last_step--;
#endif
}
initJSEngine(jsEg, cs, tmpJS);
#if MYSQL_VERSION_ID < 120100
path.currStep = path.p.steps;
#endif
int jsErr = 0;
if (locateJSPath(jsEg, path, &jsErr))
@@ -82,7 +110,13 @@ string Func_json_array_insert::getStrVal(rowgroup::Row& row, FunctionParm& fp, b
while (json_scan_next(&jsEg) == 0 && jsEg.state != JST_ARRAY_END)
{
DBUG_ASSERT(jsEg.state == JST_VALUE);
#if MYSQL_VERSION_ID >= 120100
if (itemSize == ((reinterpret_cast<json_path_step_t*>
(mem_root_dynamic_array_get_val(&path.p.steps,
path.p.last_step_idx)))[1].n_item))
#else
if (itemSize == path.p.last_step[1].n_item)
#endif
{
itemPos = (const char*)jsEg.s.c_str;
break;