database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-10-31 18:30:33 +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
committed by Leonid Fedorov
parent 9a2ebebaf9
commit 9fe37d5919
50 changed files with 1047 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
utils/funcexp/func_json_insert.cpp
View File

@@ -30,15 +30,11 @@ std::string Func_json_insert::getStrVal(rowgroup::Row& row, FunctionParm& fp, bo
const bool isInsertMode = mode == INSERT || mode == SET;
const bool isReplaceMode = mode == REPLACE || mode == SET;
json_engine_t jsEg;
int jsErr = 0;
json_string_t keyName;
const CHARSET_INFO* cs = getCharset(fp[0]);
json_string_set_cs(&keyName, cs);
initJSPaths(paths, fp, 1, 2);
// Save the result of each merge and the result of the final merge separately
std::string retJS;
utils::NullString tmpJS(js);
@@ -56,14 +52,27 @@ std::string Func_json_insert::getStrVal(rowgroup::Row& row, FunctionParm& fp, bo
if (parseJSPath(path, row, fp[i], false))
goto error;
#if MYSQL_VERSION_ID >= 120200
path.p.last_step_idx--;
#else
path.p.last_step--;
#endif
}
initJSEngine(jsEg, cs, tmpJS);
#if MYSQL_VERSION_ID >= 120200
if (path.p.last_step_idx < 0)
#else
if (path.p.last_step < path.p.steps)
#endif
goto v_found;
#if MYSQL_VERSION_ID >= 120200
if (path.p.last_step_idx >= 0 && locateJSPath(jsEg, path, &jsErr))
#else
if (path.p.last_step >= path.p.steps && locateJSPath(jsEg, path, &jsErr))
#endif
{
if (jsErr)
goto error;
@@ -73,7 +82,23 @@ std::string Func_json_insert::getStrVal(rowgroup::Row& row, FunctionParm& fp, bo
if (json_read_value(&jsEg))
goto error;
#if MYSQL_VERSION_ID >= 120200
if (path.p.last_step_idx < 0)
{
lastStep= (reinterpret_cast<json_path_step_t*>
(mem_root_dynamic_array_get_val(&path.p.steps,
0))) + path.p.last_step_idx + 1;
}
else
{
lastStep= (reinterpret_cast<json_path_step_t*>
(mem_root_dynamic_array_get_val(&path.p.steps,
path.p.last_step_idx))) + 1;
}
#else
lastStep = path.p.last_step + 1;
#endif
if (lastStep->type & JSON_PATH_ARRAY)
{
IntType itemSize = 0;