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

14
utils/funcexp/func_json_normalize.cpp
View File

@@ -25,6 +25,16 @@ CalpontSystemCatalog::ColType Func_json_normalize::operationType(
string Func_json_normalize::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& isNull,
execplan::CalpontSystemCatalog::ColType& /*type*/)
{
#if MYSQL_VERSION_ID >= 120100
json_engine_t je;
MEM_ROOT_DYNAMIC_ARRAY array;
int je_stack[JSON_DEPTH_LIMIT];
struct json_norm_value *buffer_array[JSON_DEPTH_LIMIT];
initJsonArray(&je.stack, sizeof(int), &je_stack);
initJsonArray(&array, sizeof(struct json_norm_value*), buffer_array);
#endif
const auto js_ns = fp[0]->data()->getStrVal(row, isNull);
if (isNull)
return "";
@@ -36,7 +46,11 @@ string Func_json_normalize::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool
if (init_dynamic_string(str.get(), NULL, 0, 0))
goto error;
#if MYSQL_VERSION_ID >= 120100
if (json_normalize(str.get(), js.data(), js.size(), getCharset(fp[0]), NULL, &je, &array))
#else
if (json_normalize(str.get(), js.data(), js.size(), getCharset(fp[0])))
#endif
goto error;
return str->str;