1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00

json_depth

This commit is contained in:
Rucha Deodhar
2025-05-22 15:42:12 +05:30
parent b555cf605e
commit 53870ac06f
24 changed files with 290 additions and 30 deletions

View File

@@ -22,7 +22,9 @@ int Func_json_extract::doExtract(Row& row, FunctionParm& fp, json_value_types* t
return 1;
const char* rawJS = js.str();
json_engine_t jsEg, savJSEg;
int jsEg_stack[JSON_DEPTH_LIMIT], savJSEg_stack[JSON_DEPTH_LIMIT];
json_path_t p;
json_path_step_t p_steps[JSON_DEPTH_LIMIT];
const uchar* value;
bool notFirstVal = false;
size_t valLen;
@@ -37,10 +39,25 @@ int Func_json_extract::doExtract(Row& row, FunctionParm& fp, json_value_types* t
string tmp;
initJSPaths(paths, fp, 1, 1);
vector<vector<json_path_step_t>> p_steps_arr(paths.size(), vector<json_path_step_t>(32));
mem_root_dynamic_array_init(NULL, PSI_INSTRUMENT_MEM | MY_INIT_BUFFER_USED | MY_BUFFER_NO_RESIZE,
&p.steps, sizeof(json_path_step_t), &p_steps,
JSON_DEPTH_LIMIT, 0, MYF(0));
mem_root_dynamic_array_init(NULL, PSI_INSTRUMENT_MEM | MY_INIT_BUFFER_USED | MY_BUFFER_NO_RESIZE,
&jsEg.stack, sizeof(int), &jsEg_stack,
JSON_DEPTH_LIMIT, 0, MYF(0));
mem_root_dynamic_array_init(NULL, PSI_INSTRUMENT_MEM | MY_INIT_BUFFER_USED | MY_BUFFER_NO_RESIZE,
&savJSEg.stack, sizeof(int), &savJSEg_stack,
JSON_DEPTH_LIMIT, 0, MYF(0));
for (size_t i = 1; i < argSize; i++)
{
JSONPath& path = paths[i - 1];
mem_root_dynamic_array_init(NULL, PSI_INSTRUMENT_MEM | MY_INIT_BUFFER_USED | MY_BUFFER_NO_RESIZE,
&path.p.steps, sizeof(json_path_step_t), &p_steps_arr[i-1],
JSON_DEPTH_LIMIT, 0, MYF(0));
path.p.types_used = JSON_PATH_KEY_NULL;
if (!path.parsed && parseJSPath(path, row, fp[i]))
return 1;
@@ -71,8 +88,9 @@ int Func_json_extract::doExtract(Row& row, FunctionParm& fp, json_value_types* t
while (json_get_path_next(&jsEg, &p) == 0)
{
#ifdef MYSQL_GE_1009
json_path_step_t *last_step= (json_path_step_t*)(mem_root_dynamic_array_get_val(&p.steps, p.last_step_idx));
if (hasNegPath && jsEg.value_type == JSON_VALUE_ARRAY &&
json_skip_array_and_count(&jsEg, arrayCounter + (p.last_step - p.steps)))
json_skip_array_and_count(&jsEg, arrayCounter + (last_step - (json_path_step_t*)(p.steps.buffer))))
return 1;
#endif